Tests

wri · Dec 10, 2024 · 43fdb6f · 43fdb6f
1 parent db36b69
commit 43fdb6f
Show file tree

Hide file tree

Showing 10 changed files with 410 additions and 170 deletions.
diff --git a/ckan-backend-dev/docker-compose.dev.yml b/ckan-backend-dev/docker-compose.dev.yml
@@ -136,7 +136,9 @@ services:
 
   solr:
     container_name: ${SOLR_CONTAINER_NAME}
-    image: ckan/ckan-solr:${SOLR_IMAGE_VERSION}
+      #image: ckan/ckan-solr:${SOLR_IMAGE_VERSION}
+    build:
+      context: solr/
     volumes:
       - solr_data:/var/solr
       - ./ckan/setup/schema.xml:/opt/solr/server/solr/configsets/ckan/conf/managed-schema

diff --git a/ckan-backend-dev/docker-compose.test.yml b/ckan-backend-dev/docker-compose.test.yml
@@ -146,7 +146,9 @@ services:
 
   solr:
     container_name: ${SOLR_CONTAINER_NAME}
-    image: ckan/ckan-solr:${SOLR_IMAGE_VERSION}
+      #image: ckan/ckan-solr:${SOLR_IMAGE_VERSION}
+    build:
+      context: solr/
     volumes:
       - solr_data:/var/solr
       - ./ckan/setup/schema.xml:/opt/solr/server/solr/configsets/ckan/conf/managed-schema

diff --git a/ckan-backend-dev/solr/Dockerfile b/ckan-backend-dev/solr/Dockerfile
@@ -0,0 +1,57 @@
+FROM solr:8
+
+EXPOSE 8983
+
+ARG CKAN_BRANCH="dev-v2.10"
+
+ENV SOLR_INSTALL="/opt/solr"
+ENV SOLR_CONFIG_DIR="$SOLR_INSTALL/server/solr/configsets"
+ENV SOLR_SCHEMA_FILE="$SOLR_CONFIG_DIR/ckan/conf/managed-schema"
+
+ARG JTS_VERSION="1.16.0"
+ARG JTS_JAR_FILE="$SOLR_INSTALL/server/solr-webapp/webapp/WEB-INF/lib/jts-core-$JTS_VERSION.jar"
+
+USER root
+
+# Create a CKAN configset by copying the default one
+RUN cp -R $SOLR_CONFIG_DIR/_default $SOLR_CONFIG_DIR/ckan
+
+# Update the schema
+ADD https://raw.githubusercontent.com/ckan/ckan/$CKAN_BRANCH/ckan/config/solr/schema.xml $SOLR_SCHEMA_FILE
+
+# Install JTS JAR file
+ADD https://repo1.maven.org/maven2/org/locationtech/jts/jts-core/$JTS_VERSION/jts-core-$JTS_VERSION.jar \
+    $JTS_JAR_FILE
+RUN chmod 644 $JTS_JAR_FILE
+
+# Add the spatial field type definitions and fields
+
+## RPT
+ENV SOLR_RPT_FIELD_DEFINITION '<fieldType name="location_rpt"   class="solr.SpatialRecursivePrefixTreeFieldType" \
+    spatialContextFactory="JTS"     \
+    autoIndex="true"                \
+    validationRule="repairBuffer0"  \
+    distErrPct="0.025"              \
+    maxDistErr="0.001"              \
+    distanceUnits="kilometers" />'
+
+ENV SOLR_RPT_FIELD '<field name="spatial_geom" type="location_rpt" indexed="true" multiValued="true" />'
+
+RUN sed -i "/<types>/a $SOLR_RPT_FIELD_DEFINITION" $SOLR_SCHEMA_FILE
+RUN sed -i "/<fields>/a $SOLR_RPT_FIELD" $SOLR_SCHEMA_FILE
+
+## BBox
+ENV SOLR_BBOX_FIELDS '<field name="bbox_area" type="float" indexed="true" stored="true" /> \
+    <field name="maxx" type="float" indexed="true" stored="true" /> \
+    <field name="maxy" type="float" indexed="true" stored="true" /> \
+    <field name="minx" type="float" indexed="true" stored="true" /> \
+    <field name="miny" type="float" indexed="true" stored="true" />'
+
+RUN sed -i "/<fields>/a $SOLR_BBOX_FIELDS" $SOLR_SCHEMA_FILE
+
+
+RUN chmod 644 $SOLR_SCHEMA_FILE
+
+USER solr
+
+CMD ["sh", "-c", "solr-precreate ckan $SOLR_CONFIG_DIR/ckan"]
diff --git a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/plugin.py b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/plugin.py
@@ -427,7 +427,7 @@ def before_dataset_index(self, pkg_dict):
             if len(geometries) == 0:
                 return pkg_dict
             merged_geom = shapely.ops.unary_union(geometries)
-            pkg_dict["spatial_geom"] = merged_geom
+            pkg_dict["spatial_geom"] = merged_geom.wkt
         else:
             pkg_dict = SolrSpatialFieldSearchBackend().index_dataset(pkg_dict)
 
@@ -440,6 +440,8 @@ def before_dataset_index(self, pkg_dict):
         pkg_dict.pop("extras_spatial", None)
         pkg_dict.pop("spatial", None)
 
+        print("PACKAGE DICT", flush=True)
+        print(pkg_dict, flush=True)
         return pkg_dict
 
     def before_dataset_search(self, search_params):