Merge branch 'master' into measure-additions

origo-map · Feb 12, 2025 · 38c9570 · 38c9570
2 parents 3180e66 + f1c37ad
commit 38c9570
Show file tree

Hide file tree

Showing 101 changed files with 3,046 additions and 3,030 deletions.
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ Not convinced? Or maybe you need some inspiration? Check out these examples of w
  * [Hallstakartan](http://karta.hallstahammar.se)
  * [Haninge kommun webbkarta](https://karta.haninge.se/)
  * [Karlstadskartan](http://gi.karlstad.se)
+ * [Malmö](https://stadsatlas.malmo.se/stadsatlas/)
  * [Mälardalskartan](http://www.malardalskartan.se)
  * [Sigtunakartan](https://karta.sigtuna.se)
  * [Strängnäskartan](https://kartor.strangnas.se)

diff --git a/css/style.css.map b/css/style.css.map
diff --git a/data/origo-cities-3857.geojson b/data/origo-cities-3857.geojson
@@ -24,6 +24,7 @@
 { "type": "Feature", "properties": { "id": 20, "name": "Kristianstad" }, "geometry": { "type": "Point", "coordinates": [ 1575633.0, 7565358.0 ] } },
 { "type": "Feature", "properties": { "id": 21, "name": "Mora" }, "geometry": { "type": "Point", "coordinates": [ 1618908.0, 8627715.0 ] } },
 { "type": "Feature", "properties": { "id": 22, "name": "Orsa" }, "geometry": { "type": "Point", "coordinates": [ 1627705.0, 8653421.0 ] } },
-{ "type": "Feature", "properties": { "id": 23, "name": "Tomelilla" }, "geometry": { "type": "Point", "coordinates": [ 1553290.0, 7467849.0 ] } }
+{ "type": "Feature", "properties": { "id": 23, "name": "Tomelilla" }, "geometry": { "type": "Point", "coordinates": [ 1553290.0, 7467849.0 ] } },
+{ "type": "Feature", "properties": { "id": 24, "name": "Haninge" }, "geometry": { "type": "Point", "coordinates": [ 2018984, 8216175 ] } }
 ]
 }
diff --git a/data/origo-mask-3857.geojson b/data/origo-mask-3857.geojson
diff --git a/index.json b/index.json
@@ -40,7 +40,7 @@
       "name": "legend",
       "options": {
         "labelOpacitySlider": "Opacity",
-        "useGroupIndication" : true
+        "useGroupIndication": true
       }
     },
     {
@@ -258,4 +258,4 @@
       ]
     ]
   }
-}
+}
diff --git a/origo.js b/origo.js
@@ -29,6 +29,7 @@ import 'drag-drop-touch';
 import permalink from './src/permalink/permalink';
 import * as Loader from './src/loading';
 import Spinner from './src/utils/spinner';
+import layerType from './src/layer/layertype';
 
 const Origo = function Origo(configPath, options = {}) {
   /** Reference to the returned Component */
@@ -193,5 +194,6 @@ Origo.Loader.show = Loader.showLoading;
 Origo.Loader.hide = Loader.hideLoading;
 Origo.Loader.withLoading = Loader.withLoading;
 Origo.Loader.getInlineSpinner = Spinner;
+Origo.layerType = layerType;
 
 export default Origo;