Merge pull request #120 from semone/leaflet-proj-refactor

Leaflet proj refactor
kartena · Sep 5, 2016 · 6feb358 · 6feb358
2 parents ec8faa3 + 7345856
commit 6feb358
Show file tree

Hide file tree

Showing 26 changed files with 8,413 additions and 4,437 deletions.
diff --git a/examples/geojson-crs/index.html b/examples/geojson-crs/index.html
@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="style.css" />
-	<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet.css" />
+    <link rel="stylesheet" href="../../lib/leaflet/leaflet.css" />
   </head>
   <body>
     <div id="map"></div>
-	<script src="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet-src.js"></script>
+    <script src="../../lib/leaflet/leaflet.js"></script>
     <script src="../../lib/proj4-compressed.js"></script>
     <script src="../../src/proj4leaflet.js"></script>
     <script src="script.js"></script>

diff --git a/examples/geojson-crs/script.js b/examples/geojson-crs/script.js
@@ -1,18 +1,14 @@
 var map = L.map('map').setView([44.97,-93.24], 11);
 
-// MapQuest OSM Tiles
-
-// Attribution (https://gist.github.com/mourner/1804938)
-var osmAttr = 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-    mqTilesAttr = 'Tiles &copy; <a href="http://www.mapquest.com/"" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />';
+// OSM Tiles
 
 L.tileLayer(
-  'http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png',
+  'http://tile.openstreetmap.org/{z}/{x}/{y}.png', 
   {
-    subdomains: '1234',
-    attribution: osmAttr + ', ' + mqTilesAttr
+      attribution: 'Data by <a href="http://openstreetmap.org">OpenStreetMap contributors</a>'
   }
-).addTo(map);
+)
+.addTo(map);
 
 // GeoJSON layer (UTM15)
 proj4.defs('EPSG:26915', '+proj=utm +zone=15 +ellps=GRS80 +datum=NAD83 +units=m +no_defs');

diff --git a/examples/local-projections/europe/index_austria.html b/examples/local-projections/europe/index_austria.html
@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="../style.css" />
-	<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet.css" />
+    <link rel="stylesheet" href="../../../lib/leaflet/leaflet.css" />
   </head>
   <body>
     <div id="map"></div>
-	<script src="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet-src.js"></script>
+    <script src="../../../lib/leaflet/leaflet.js"></script>
     <script src="../../../lib/proj4-compressed.js"></script>
     <script src="../../../src/proj4leaflet.js"></script>
     <script src="script_austria.js"></script>

diff --git a/examples/local-projections/nz/index_auckland.html b/examples/local-projections/nz/index_auckland.html
@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="../style.css" />
-	<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet.css" />
+    <link rel="stylesheet" href="../../../lib/leaflet/leaflet.css" />
   </head>
   <body>
     <div id="map"></div>
-	<script src="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet-src.js"></script>
+    <script src="../../../lib/leaflet/leaflet.js"></script>
     <script src="../../../lib/proj4-compressed.js"></script>
     <script src="../../../src/proj4leaflet.js"></script>
     <script src="script_auckland.js"></script>

diff --git a/examples/osm-tiled/index.html b/examples/osm-tiled/index.html
@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="style.css" />
-	<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet.css" />
-  </head>
+    <link rel="stylesheet" href="../../lib/leaflet/leaflet.css" />
+ </head>
   <body>
     <div id="map"></div>
-	<script src="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet-src.js"></script>
+    <script src="../../lib/leaflet/leaflet.js"></script>
     <script src="../../lib/proj4-compressed.js"></script>
     <script src="../../src/proj4leaflet.js"></script>
     <script src="script.js"></script>

diff --git a/examples/tms-tiled/index.html b/examples/tms-tiled/index.html
@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="style.css" />
-	<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet.css" />
+    <link rel="stylesheet" href="../../lib/leaflet/leaflet.css" />
   </head>
   <body>
     <div id="map"></div>
-	<script src="http://cdn.leafletjs.com/leaflet/v1.0.0-beta.2/leaflet-src.js"></script>
+    <script src="../../lib/leaflet/leaflet.js"></script>
     <script src="../../lib/proj4-compressed.js"></script>
     <script src="../../src/proj4leaflet.js"></script>
     <script src="script.js"></script>

diff --git a/examples/wms/index.html b/examples/wms/index.html
@@ -7,7 +7,7 @@
   </head>
   <body>
     <div id="map"></div>
-    <script src="../../lib/leaflet/leaflet-src.js"></script>
+    <script src="../../lib/leaflet/leaflet.js"></script>
     <script src="../../lib/proj4-compressed.js"></script>
     <script src="../../src/proj4leaflet.js"></script>
     <script src="script.js"></script>

diff --git a/examples/wms/script.js b/examples/wms/script.js
@@ -11,12 +11,12 @@ var crs = new L.Proj.CRS('EPSG:3006',
 		crs: crs,
 	});
 
-L.tileLayer.wms('http://geodatatest.havochvatten.se/geoservices/ows', {
+L.tileLayer.wms('http://geodata.havochvatten.se/geoservices/hav-bakgrundskartor/ows', {
 	layers: 'hav-bakgrundskartor:hav-grundkarta',
 	format: 'image/png',
 	maxZoom: 14,
 	minZoom: 0,
-	attribution: '&copy; <a href="https://www.havochvatten.se/kunskap-om-vara-vatten/kartor-och-geografisk-information/karttjanster.html">Havs- och vattenmyndigheten (Swedish Agency for Marine and Water Management)</a>'
+	attribution: '&copy; OpenStreetMap contributors <a href="https://www.havochvatten.se/kunskap-om-vara-vatten/kartor-och-geografisk-information/karttjanster.html">Havs- och vattenmyndigheten (Swedish Agency for Marine and Water Management)</a>'
 }).addTo(map);
 
-map.setView([55.8, 14.3], 6);
+map.setView([55.8, 14.3], 3);
diff --git a/lib/images/layers-2x.png b/lib/images/layers-2x.png
diff --git a/lib/images/layers.png b/lib/images/layers.png
diff --git a/lib/images/marker-icon-2x.png b/lib/images/marker-icon-2x.png
diff --git a/lib/images/marker-icon.png b/lib/images/marker-icon.png
diff --git a/lib/images/marker-shadow.png b/lib/images/marker-shadow.png
diff --git a/lib/images/zoom-in.png b/lib/images/zoom-in.png
diff --git a/lib/images/zoom-out.png b/lib/images/zoom-out.png
diff --git a/lib/leaflet/images/layers-2x.png b/lib/leaflet/images/layers-2x.png
diff --git a/lib/leaflet/images/layers.png b/lib/leaflet/images/layers.png
diff --git a/lib/leaflet/images/marker-icon-2x.png b/lib/leaflet/images/marker-icon-2x.png
diff --git a/lib/leaflet/images/marker-icon.png b/lib/leaflet/images/marker-icon.png
diff --git a/lib/leaflet/images/marker-shadow.png b/lib/leaflet/images/marker-shadow.png