Merge pull request #2168 from umap-project/georsstogeojson-as-esm

chore: use GeoRSStoGeoJSON as ES module

package.json

@@ -43,7 +43,7 @@
     "colorbrewer": "^1.5.6",
     "csv2geojson": "5.1.2",
     "dompurify": "^3.0.11",
-    "georsstogeojson": "^0.1.0",
+    "georsstogeojson": "^0.2.0",
     "jsdom": "^24.0.0",
     "leaflet": "1.9.4",
     "leaflet-contextmenu": "^1.4.0",

umap/static/umap/js/modules/formatter.js

@@ -1,4 +1,4 @@
-/* Uses globals for: csv2geojson, osmtogeojson, GeoRSSToGeoJSON (not available as ESM) */
+/* Uses globals for: csv2geojson, osmtogeojson (not available as ESM) */
 import { translate } from './i18n.js'
 
 export const EXPORT_FORMATS = {
@@ -115,7 +115,8 @@ export class Formatter {
   }
 
   async fromGeoRSS(str) {
-    return GeoRSSToGeoJSON(this.toDom(str))
+    const GeoRSSToGeoJSON = await import('../../vendors/georsstogeojson/GeoRSSToGeoJSON.js')
+    return GeoRSSToGeoJSON.parse(this.toDom(str))
   }
 
   toDom(x) {

umap/static/umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js

@@ -1,89 +1,120 @@
-var GeoRSSToGeoJSON = function (dom, options) {
+export function parse(dom, options) {
-
+  const g = {
-    function get(x, y) { return x.getElementsByTagName(y); }
-    function get1(x, y) { var n = get(x, y); return n.length ? n[0] : null; }
-    function norm(el) { if (el.normalize) { el.normalize(); } return el; }
-    function nodeVal(x) { if (x) {norm(x);} return x && x.firstChild && x.firstChild.nodeValue; }
-    function attr(x, y) { return x.getAttribute(y); }
-
-    var g = {
     type: 'FeatureCollection',
-        features: []
+    features: [],
-    };
+  }
 
-    function geom (node) {
+  const items = get(dom, 'item')
+  for (const item of Array.from(items)) {
+    const feature = processOne(item)
+    if (feature) {
+      g.features.push(feature)
+    }
+  }
+  return g
+}
 
-        function p(c) {return parseFloat(c);}
+function get(x, y) {
-        function r(c) {return c.reverse().map(p);}  // we have latlon we want lonlat
+  return x.getElementsByTagName(y)
-        function e(f) {var _=[]; for (var i=0; i<f.length; i+=2) {_.push(r(f.slice(i, i+2)));} return _;}
+}
+function get1(x, y) {
+  const n = get(x, y)
+  return n.length ? n[0] : null
+}
+function norm(el) {
+  if (el.normalize) {
+    el.normalize()
+  }
+  return el
+}
+function nodeVal(x) {
+  if (x) {
+    norm(x)
+  }
+  return x?.firstChild?.nodeValue
+}
+function attr(x, y) {
+  return x.getAttribute(y)
+}
 
-        var type, coordinates;
+function geom(node) {
+  function p(c) {
+    return parseFloat(c)
+  }
+  function r(c) {
+    return c.reverse().map(p)
+  } // we have latlon we want lonlat
+  function e(f) {
+    const _ = []
+    for (let i = 0; i < f.length; i += 2) {
+      _.push(r(f.slice(i, i + 2)))
+    }
+    return _
+  }
+
+  let type
+  let coordinates
 
-        NODE = node;
   if (get1(node, 'geo:long')) {
-            type = 'Point';
+    type = 'Point'
-            coordinates = [p(nodeVal(get1(node, 'geo:long'))), p(nodeVal(get1(node, 'geo:lat')))];
+    coordinates = [
+      p(nodeVal(get1(node, 'geo:long'))),
+      p(nodeVal(get1(node, 'geo:lat'))),
+    ]
   } else if (get1(node, 'long')) {
-            type = 'Point';
+    type = 'Point'
-            coordinates = [p(nodeVal(get1(node, 'long'))), p(nodeVal(get1(node, 'lat')))];
+    coordinates = [p(nodeVal(get1(node, 'long'))), p(nodeVal(get1(node, 'lat')))]
   } else if (get1(node, 'georss:point')) {
-            type = 'Point';
+    type = 'Point'
-            coordinates = r(nodeVal(get1(node, 'georss:point')).split(' '));
+    coordinates = r(nodeVal(get1(node, 'georss:point')).split(' '))
   } else if (get1(node, 'point')) {
-            type = 'Point';
+    type = 'Point'
-            coordinates = r(nodeVal(get1(node, 'point')).split(' '));
+    coordinates = r(nodeVal(get1(node, 'point')).split(' '))
   } else {
-            var line = get1(node, 'georss:line'),
+    const line = get1(node, 'georss:line')
-                poly = get1(node, 'georss:polygon');
+    const poly = get1(node, 'georss:polygon')
     if (line || poly) {
-                type = line ? 'LineString' : 'Polygon';
+      type = line ? 'LineString' : 'Polygon'
-                var tag = line ? 'georss:line' : 'georss:polygon';
+      const tag = line ? 'georss:line' : 'georss:polygon'
-                coordinates = nodeVal(get1(node, tag)).split(' ');
+      coordinates = nodeVal(get1(node, tag)).split(' ')
-                if (coordinates.length % 2 !== 0) return;
+      if (coordinates.length % 2 !== 0) return
-                coordinates = e(coordinates);
+      coordinates = e(coordinates)
       if (poly) {
-                    coordinates = [coordinates];
+        coordinates = [coordinates]
       }
     }
   }
   if (type && coordinates) {
     return {
       type: type,
-                coordinates: coordinates
+      coordinates: coordinates,
-            };
     }
   }
+}
 
-    function processOne (node) {
+function processOne(node) {
-        var geometry = geom(node);
+  const geometry = geom(node)
   // TODO collect and fire errors
-        if (!geometry) return;
+  if (!geometry) return
-        var f = {
+  const f = {
-            type: "Feature",
+    type: 'Feature',
     geometry: geometry,
     properties: {
       title: nodeVal(get1(node, 'title')),
       description: nodeVal(get1(node, 'description')),
       link: nodeVal(get1(node, 'link')),
+    },
   }
-        };
+  let media = get1(node, 'media:content')
-        var media = get1(node, 'media:content'), mime;
+  let mime
   if (!media) {
-            media = get1(node, 'enclosure'), mime;
+    media = get1(node, 'enclosure')
   }
   if (media) {
-            mime = attr(media, 'type');
+    mime = attr(media, 'type')
     if (mime.indexOf('image') !== -1) {
-                f.properties.img = attr(media, "url");  // How not to invent a key?
+      f.properties.img = attr(media, 'url') // How not to invent a key?
     }
   }
-        g.features.push(f);
+  return f
-    }
+}
-
-    var items = get(dom, 'item');
-    for (var i = 0; i < items.length; i++) {
-        processOne(items[i]);
-    }
-    return g;
-};
-if (typeof module !== 'undefined') module.exports = {GeoRSSToGeoJSON: GeoRSSToGeoJSON};

umap/templates/umap/js.html

@@ -28,8 +28,6 @@
 <script src="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.js' %}"
         defer></script>
 <script src="{% static 'umap/vendors/photon/leaflet.photon.js' %}" defer></script>
-<script src="{% static 'umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js' %}"
-        defer></script>
 <script src="{% static 'umap/vendors/fullscreen/Leaflet.fullscreen.min.js' %}"
         defer></script>
 <script src="{% static 'umap/vendors/toolbar/leaflet.toolbar.js' %}" defer></script>