Harvester arcgis

geonode/base/models.py

@@ -68,6 +68,7 @@
 from geonode.utils import (
     bbox_to_wkt,
     find_by_attr,
+    bbox_to_projection,
     is_monochromatic_image)
 from geonode.groups.models import GroupProfile
 from geonode.security.utils import get_visible_resources, get_geoapp_subtypes
@@ -1426,7 +1427,9 @@ def set_bbox_polygon(self, bbox, srid):
             match = re.match(r'^(EPSG:)?(?P<srid>\d{4,6})$', str(srid))
             bbox_polygon.srid = int(match.group('srid')) if match else 4326
             try:
-                self.ll_bbox_polygon = bbox_polygon.transform(4326, clone=True)
+                # self.ll_bbox_polygon = bbox_polygon.transform(4326, clone=True)
+                self.ll_bbox_polygon = Polygon.from_bbox(
+                    bbox_to_projection(list(bbox_polygon.extent) + [srid])[:-1])
             except Exception as e:
                 logger.error(e)
                 self.ll_bbox_polygon = bbox_polygon

geonode/harvesting/admin.py

@@ -334,15 +334,13 @@ class HarvestableResourceAdmin(admin.ModelAdmin):
         "last_harvested",
         "unique_identifier",
         "title",
-        "abstract",
         "show_link_to_harvester",
         "should_be_harvested",
         "remote_resource_type",
     )
     readonly_fields = (
         "unique_identifier",
         "title",
-        "abstract",
         "harvester",
         "last_updated",
         "last_refreshed",
@@ -360,7 +358,6 @@ class HarvestableResourceAdmin(admin.ModelAdmin):
     )
     search_fields = (
         "title",
-        "abstract",
     )
     list_editable = (
         "should_be_harvested",

geonode/harvesting/api/serializers.py

@@ -162,13 +162,7 @@ def create(self, validated_data):
                 f"Either omit it or provide a "
                 f"value of {models.Harvester.STATUS_READY!r}"
             )
-        harvester = super().create(validated_data)
-        available = harvester.update_availability()
-        if available:
-            harvester.status = harvester.STATUS_UPDATING_HARVESTABLE_RESOURCES
-            harvester.save()
-            tasks.update_harvestable_resources.apply_async(args=(harvester.pk,))
-        return harvester
+        return super().create(validated_data)
 
     def update(self, instance: models.Harvester, validated_data):
         """Update harvester and perform any required business logic as a side-effect.

geonode/harvesting/apps.py

@@ -20,43 +20,10 @@
 from django.apps import AppConfig
 from django.conf import settings
 from django.conf.urls import url, include
-from django.db.models.signals import post_migrate
 
 from . import config
 
 
-def run_setup_hooks(sender, **kwargs):
-    from django.utils import timezone
-
-    # Initialize periodic tasks
-    if 'django_celery_beat' in settings.INSTALLED_APPS and \
-            getattr(settings, 'CELERY_BEAT_SCHEDULER', None) == 'django_celery_beat.schedulers:DatabaseScheduler':
-        from django_celery_beat.models import (
-            IntervalSchedule,
-            PeriodicTask,
-        )
-
-        secs = config.get_setting("HARVESTER_SCHEDULER_FREQUENCY_MINUTES") * 60
-        check_intervals = IntervalSchedule.objects.filter(every=secs, period="seconds")
-        if not check_intervals.exists():
-            check_interval, _ = IntervalSchedule.objects.get_or_create(
-                every=secs,
-                period="seconds"
-            )
-        else:
-            check_interval = check_intervals.first()
-
-        PeriodicTask.objects.update_or_create(
-            name="harvesting-scheduler",
-            defaults=dict(
-                task="geonode.harvesting.tasks.harvesting_scheduler",
-                interval=check_interval,
-                args='',
-                start_time=timezone.now()
-            )
-        )
-
-
 class HarvestingAppConfig(AppConfig):
 
     name = "geonode.harvesting"
@@ -67,7 +34,6 @@ def ready(self):
         urlpatterns += [
             url(r'^api/v2/', include('geonode.harvesting.api.urls'))
         ]
-        post_migrate.connect(run_setup_hooks, sender=self)
         settings.CELERY_BEAT_SCHEDULE['harvesting-scheduler'] = {
             "task": "geonode.harvesting.tasks.harvesting_scheduler",
             "schedule": config.get_setting("HARVESTER_SCHEDULER_FREQUENCY_MINUTES") * 60,

geonode/harvesting/config.py

@@ -29,9 +29,9 @@
 
 
 _DEFAULT_HARVESTERS: typing.Final = [
-    "geonode.harvesting.harvesters.geonodeharvester.GeonodeLegacyHarvester",
+    "geonode.harvesting.harvesters.geonodeharvester.GeonodeUnifiedHarvesterWorker",
     "geonode.harvesting.harvesters.wms.OgcWmsHarvester",
-    # "geonode.harvesting.harvesters.geonode.GeonodeCswHarvester",
+    "geonode.harvesting.harvesters.arcgis.ArcgisHarvesterWorker",
 ]