leaflet-tilelayer-swiss - npm Package Compare versions

Comparing version 0.2.0 to 1.0.0-rc.1

Leaflet.TileLayer.Swiss.js

@@ -0,1 +1,6 @@
+/*!
+ * Leaflet.TileLayer.Swiss (https://github.com/rzoller/Leaflet.TileLayer.Swiss)
+ * Copyright (c) 2018 Roman Zoller
+ * License: MIT (https://rzoller.ch/Leaflet.TileLayer.Swiss/LICENSE)
+ */
 (function (factory, window) {
@@ -15,39 +20,65 @@ if (typeof define === 'function' && define.amd) {
 
-    // Definition for projected coordinate system CH1903+ / LV95 (EPSG:2056)
-    // Source: https://epsg.io/2056.js
-    var epsgCode = 'EPSG:2056';
-    var proj4Definition = '+proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 ' +
-        '+x_0=2600000 +y_0=1200000 +ellps=bessel +towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +no_defs';
-
-    // Bounding box for tiles in EPSG:2056
-    // Source: https://wmts.geo.admin.ch/EPSG/2056/1.0.0/WMTSCapabilities.xml
-    var topLeft = L.point(2420000, 1350000);
-    var bottomRight = L.point(2900000, 1030000);
-    var bounds = L.bounds(topLeft, bottomRight);
-
     // Available resolutions
     // Source: https://api3.geo.admin.ch/services/sdiservices.html#wmts
-    var resolutions = [4000, 3750, 3500, 3250, 3000, 2750, 2500, 2250, 2000, 1750, 1500, 1250, 1000,
-        750, 650, 500, 250, 100, 50, 20, 10, 5, 2.5, 2, 1.5, 1, 0.5, 0.25, 0.1];
+    var resolutions = [4000, 3750, 3500, 3250, 3000, 2750, 2500, 2250, 2000, 1750, 1500, 1250, 1000, 750, 650, 500, 250, 100, 50, 20, 10, 5, 2.5, 2, 1.5, 1, 0.5, 0.25, 0.1];
 
-    var crs = new Proj.CRS(epsgCode, proj4Definition, {
-        bounds: bounds,
-        origin: [topLeft.x, topLeft.y],
-        resolutions: resolutions
+    var makeCrs = function(options) {
+        var bounds = L.bounds(options.min, options.max);
+        var origin = [options.min.x, options.max.y];
+        return new Proj.CRS(options.code, options.definition, {
+            bounds: bounds,
+            origin: origin,
+            resolutions: resolutions
+        });
+    };
+
+    var EPSG_2056 = makeCrs({
+        // Definition for projected coordinate system CH1903+ / LV95 (EPSG:2056)
+        // Source: https://epsg.io/2056.js
+        code: 'EPSG:2056',
+        definition: '+proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=2600000 +y_0=1200000 +ellps=bessel +towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +no_defs',
+        // Bounding box for tiles in EPSG:2056
+        // Source: https://wmts.geo.admin.ch/EPSG/2056/1.0.0/WMTSCapabilities.xml
+        min: L.point(2420000, 1030000),
+        max: L.point(2900000, 1350000)
     });
+    var project_2056 = function(latLng) {
+        return EPSG_2056.projection.project(latLng);
+    }
+    var unproject_2056 = function(point) {
+        return EPSG_2056.projection.unproject(point);
+    }
 
-    function project(latLng) {
-        return crs.projection.project(latLng);
+    var EPSG_21781 = makeCrs({
+        // Definition for projected coordinate system CH1903 / LV03 (EPSG:21781)
+        // Source: https://epsg.io/21781.js
+        code: 'EPSG:21781',
+        definition: '+proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=600000 +y_0=200000 +ellps=bessel +towgs84=674.4,15.1,405.3,0,0,0,0 +units=m +no_defs',
+        // Bounding box for tiles in EPSG:21781
+        // Source: https://wmts.geo.admin.ch/EPSG/21781/1.0.0/WMTSCapabilities.xml
+        min: L.point(420000, 30000),
+        max: L.point(900000, 350000)
+    });
+    var project_21781 = function(latLng) {
+        return EPSG_21781.projection.project(latLng);
     }
+    var unproject_21781 = function(point) {
+        return EPSG_21781.projection.unproject(point);
+    }
 
-    function unproject(point) {
-        return crs.projection.unproject(point);
+    var latLngBounds = L.latLngBounds(
+        unproject_2056(EPSG_2056.options.bounds.min),
+        unproject_2056(EPSG_2056.options.bounds.max)
+    );
+
+    var URLS = {
+        'EPSG:2056': 'https://wmts{s}.geo.admin.ch/1.0.0/{layer}/default/{timestamp}/2056/{z}/{x}/{y}.{format}',
+        'EPSG:21781': 'https://wmts{s}.geo.admin.ch/1.0.0/{layer}/default/{timestamp}/21781/{z}/{y}/{x}.{format}',
     }
 
-    var latLngBounds = L.latLngBounds(unproject(topLeft), unproject(bottomRight));
-
     var Swiss = L.TileLayer.extend({
         options: {
-            attribution: 'Map data © swisstopo',
+            attribution: '<a href="https://www.swisstopo.admin.ch/en/home.html">swisstopo</a>',
             bounds: latLngBounds,
+            crs: EPSG_2056,
             format: 'jpeg',
@@ -62,12 +93,14 @@ layer: 'ch.swisstopo.pixelkarte-farbe',
             options = L.setOptions(this, options);
-            var url = 'https://wmts{s}.geo.admin.ch/1.0.0/{layer}/default/{timestamp}/2056/{z}/{x}/{y}.{format}';
+            var url = URLS[options.crs.code];
             L.TileLayer.prototype.initialize.call(this, url, options);
         }
-
     });
 
-    Swiss.crs = crs;
     Swiss.latLngBounds = latLngBounds;
-    Swiss.project = project;
-    Swiss.unproject = unproject;
+    Swiss.EPSG_2056 = EPSG_2056;
+    Swiss.project_2056 = project_2056;
+    Swiss.unproject_2056 = unproject_2056;
+    Swiss.EPSG_21781 = EPSG_21781;
+    Swiss.project_21781 = project_21781;
+    Swiss.unproject_21781 = unproject_21781;
 
@@ -74,0 +107,0 @@ L.tileLayer.swiss = function (options) {

package.json

 {
   "name": "leaflet-tilelayer-swiss",
-  "version": "0.2.0",
+  "version": "1.0.0-rc.1",
   "description": "Leaflet.TileLayer.Swiss.js is a Leaflet plugin for creating tile layers from swisstopo, the Swiss Federal Office of Topography.",
@@ -12,3 +12,3 @@ "main": "Leaflet.TileLayer.Swiss.js",
   "author": "Roman Zoller",
-  "license": "ISC",
+  "license": "MIT",
   "peerDependencies": {
@@ -15,0 +15,0 @@ "leaflet": "^1.3.1",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No README

Quality

Package does not have a README. This may indicate a failed publish or a low quality package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

11090

increased by231.84%

Number of package files

4

increased by100%

Lines of code

100

increased by53.85%

Number of medium quality alerts

1

decreased by-50%

Number of lines in readme file

134

increased byInfinity%

No dependency changes