Adds userinfo on exports to be available

Author: kshitijrajsharma

api/serializers.py

@@ -5,6 +5,7 @@
 Used by the View classes api/views.py to serialize API responses as JSON or HTML.
 See DEFAULT_RENDERER_CLASSES setting in core.settings.contrib for the enabled renderers.
 """
+
 # -*- coding: utf-8 -*-
 import logging
 
@@ -113,7 +114,7 @@ class Meta:
             "mbtiles_maxzoom",
             "pinned",
             "unfiltered",
-            "preserve_geom",
+            "userinfo",
         )
         extra_kwargs = {
             "the_geom": {"write_only": True},

jobs/migrations/0001_initial.py

@@ -96,7 +96,7 @@ class Migration(migrations.Migration):
                 ("expire_old_runs", models.BooleanField(default=True)),
                 ("pinned", models.BooleanField(default=False)),
                 ("unfiltered", models.BooleanField(default=False)),
-                ("preserve_geom", models.BooleanField(default=False)),
+                ("userinfo", models.BooleanField(default=False)),
                 (
                     "user",
                     models.ForeignKey(

jobs/models.py

@@ -205,7 +205,7 @@ class Job(models.Model):
     expire_old_runs = models.BooleanField(default=True)
     pinned = models.BooleanField(default=False)
     unfiltered = models.BooleanField(default=False)
-    preserve_geom = models.BooleanField(default=False)
+    userinfo = models.BooleanField(default=False)
 
     class Meta:  # pragma: no cover
         managed = True

tasks/task_runners.py

@@ -675,17 +675,16 @@ def add_metadata(z, theme):
         mapping_filter = mapping
         if job.unfiltered:
             mapping_filter = None
+        userinfo = job.userinfo
 
         if "geojson" in export_formats:
-            preserved_geom = geom
-            if job.preserve_geom:
-                preserved_geom = load_geometry(job.the_geom.json)
             geojson = Galaxy(
                 settings.RAW_DATA_API_URL,
-                preserved_geom,
+                geom,
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                userinfo=userinfo,
             )
             start_task("geojson")
 
@@ -696,6 +695,7 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                userinfo=userinfo,
             )
             start_task("fgb")
 
@@ -716,6 +716,7 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                userinfo=userinfo,
             )
             start_task("sql")
 
@@ -726,6 +727,7 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                userinfo=userinfo,
             )
             # geopackage = tabular.Geopackage(join(stage_dir,valid_name),mapping)
             # tabular_outputs.append(geopackage)
@@ -738,6 +740,7 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                userinfo=userinfo,
             )
             start_task("shp")
 
@@ -748,6 +751,7 @@ def add_metadata(z, theme):
                 mapping=mapping_filter,
                 file_name=valid_name,
                 access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                userinfo=userinfo,
             )
             # kml = tabular.Kml(join(stage_dir,valid_name),mapping)
             # tabular_outputs.append(kml)
@@ -912,6 +916,7 @@ def add_metadata(z, theme):
                     mapping=mapping_filter,
                     file_name=valid_name,
                     access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                    userinfo=userinfo,
                 )
                 start_task("mbtiles")
                 LOG.debug(
@@ -944,6 +949,7 @@ def add_metadata(z, theme):
                     mapping=mapping_filter,
                     file_name=valid_name,
                     access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                    userinfo=userinfo,
                 )
                 start_task("pmtiles")
                 LOG.debug(
@@ -976,6 +982,7 @@ def add_metadata(z, theme):
                     mapping=mapping_filter,
                     file_name=valid_name,
                     access_token=settings.RAW_DATA_ACCESS_TOKEN,
+                    userinfo=userinfo,
                 )
                 start_task("mvt")
                 LOG.debug("Raw Data API fetch started for mvt run: {0}".format(run_uid))

ui/app/actions/exports.js

@@ -64,7 +64,7 @@ export const cloneExport = e => (dispatch, getState) => {
           name: e.name,
           published: e.published,
           unfiltered: e.unfiltered,
-          preserve_geom: e.preserve_geom,
+          userinfo: e.userinfo,
           the_geom: rsp.data.the_geom,
           aoi: {
             description: "Cloned Area",

ui/app/components/Summary.js

@@ -15,9 +15,9 @@ const messages = defineMessages({
   //   id: "export.bundle_for_posm.description",
   //   defaultMessage: "Bundle for POSM"
   // },
-  preserveGeometry: {
-    id: "export.preserve_geom.description",
-    defaultMessage: "Preserve Geometry - Avoid simplify ( Only supports for geojson )"
+  userinfo: {
+    id: "export.userinfo.description",
+    defaultMessage: "Include user info on exports"
   },
   publishedDescription: {
     id: "export.published.description",
@@ -84,12 +84,12 @@ export default injectIntl(
           component={renderCheckbox}
           type="checkbox"
         /> */}
-        {/* <Field
-          name="preserve_geom"
-          description={formatMessage(messages.preserveGeometry)}
+        <Field
+          name="userinfo"
+          description={formatMessage(messages.userinfo)}
           component={renderCheckbox}
           type="checkbox"
-        /> */}
+        /> 
         <Button
           bsStyle="danger"
           disabled={submitting}

utils/aoi_utils.py

@@ -11,22 +11,22 @@
 #   be buffered efficiently, they must be simplified first.
 #   so first simplify them to 0.01 degrees.
 
+
 def force2d(geom):
     # force geom to be 2d: https://groups.google.com/forum/#!topic/django-users/7c1NZ76UwRU
     wkt = wkt_w(dim=2).write(geom).decode()
     return GEOSGeometry(wkt)
 
-def simplify_geom(geom,force_buffer=False, preserve_geom=False):
-    if preserve_geom is False:
-        if geom.num_coords > 10000:
-            geom = geom.simplify(0.01)
-        if geom.num_coords > 500:
-            geom = geom.buffer(0.02)
-        param = 0.01
-        while geom.num_coords > 500:
-            geom = geom.simplify(param, preserve_topology=True)
-            param = param * 2
+
+def simplify_geom(geom, force_buffer=False):
+    if geom.num_coords > 10000:
+        geom = geom.simplify(0.01)
+    if geom.num_coords > 500:
+        geom = geom.buffer(0.02)
+    param = 0.01
+    while geom.num_coords > 500:
+        geom = geom.simplify(param, preserve_topology=True)
+        param = param * 2
     if force_buffer:
-            geom = geom.buffer(0.02)
+        geom = geom.buffer(0.02)
     return geom
-