Updated Stetl to latest xmlelementreader.py fix

nlextract · Oct 4, 2017 · 2e33853 · 2e33853
1 parent 61330bf
commit 2e33853
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/bgt/etl/test/input/testdata_bgt.zip b/bgt/etl/test/input/testdata_bgt.zip
diff --git a/externals/stetl b/externals/stetl
diff --git a/opentopo/app/index-m.html b/opentopo/app/index-m.html
@@ -4,9 +4,9 @@
     <title>NLExtract - Apps</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
 </head>
 <body>
 <nav class="navbar navbar-default">

diff --git a/opentopo/app/index.html b/opentopo/app/index.html
@@ -4,9 +4,9 @@
     <title>OpenTopo - Apps</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
 </head>
 <body>
 <nav class="navbar navbar-default">
@@ -42,24 +42,24 @@ <h2>OpenTopo Apps</h2>
         <tbody>
         <tr>
             <td>
-                <a href="http://app.map5.nl/nltopo/?key=gast#osm/opentopo/15/5.773337/52.10192">
+                <a href="https://app.map5.nl/nltopo/?key=gast#osm/opentopo/15/5.773337/52.10192">
                     <img src="images/screenshots/opentopo-osm-s.png" class="img-rounded" alt="OpenTopo OSM">
                 </a>
 
                 <p>
-                    <a href="http://app.map5.nl/nltopo/?key=gast#osm/opentopo/15/5.773337/52.10192">OpenTopo Mobile Map Viewer (OSM)</a><br>
+                    <a href="https://app.map5.nl/nltopo/?key=gast#osm/opentopo/15/5.773337/52.10192">OpenTopo Mobile Map Viewer (OSM)</a><br>
                     Basis map viewer met OpenTopo tiles in OpenStreetMap (OSM)/Google schema.
                     Gemaakt met Leaflet. Maker: Just van den Broecke.
                 </p>
             </td>
 
             <td>
-                <a href="http://app.map5.nl/nltopo/">
+                <a href="https://app.map5.nl/nltopo/">
                     <img src="images/screenshots/opentopo-rd-s.png" class="img-rounded" alt="OpenTopo RD">
                 </a><br>
 
                 <p>
-                    <a href="http://app.map5.nl/nltopo/">OpenTopo Mobile Map Viewer (RD)</a><br>
+                    <a href="https://app.map5.nl/nltopo/">OpenTopo Mobile Map Viewer (RD)</a><br>
                     Basis map viewer met OpenTopo tiles in Nederlands PDOK-schema.
                     Gemaakt met Leaflet. Maker: Just van den Broecke.
                 </p>
@@ -79,13 +79,13 @@ <h2>OpenTopo Apps</h2>
 
             </td>
             <td>
-                <a href="http://kadviewer.kademo.nl">
+                <a href="https://kadviewer.map5.nl">
                     <img src="images/screenshots/opentopo-kadviewer-s.png" class="img-rounded" alt="OpenTopo KadViewer">
                 </a>
 
-                <p><a href="http://kadviewer.kademo.nl">De KadViewer</a>
+                <p><a href="https://kadviewer.map5.nl">De Map5 KadViewer</a>
                     is een op het <a href="http://heron-mc.org">Heron viewer framework</a>
-                    gebaseerde web-desktop app met daarin OpenTopo via http://map5.nl en veel
+                    gebaseerde web-desktop app met daarin OpenTopo via https://map5.nl en veel
                     andere interessante kaartlagen. Mogelijkheid tot kaartlagen over elkaar heen leggen
                     en doorzichtigheid daarbij aan te passen, plus vele andere "tools" bijv tekenen (redlining),
                     WFS queries en upload/download van vector data.
@@ -114,7 +114,7 @@ <h2>OpenTopo Apps</h2>
         </tbody>
     </table>
     <p>
-        Zie verder ook de <a href="../3d">3D demos</a> en <a href="http://app.map5.nl">app.map5.nl</a>.
+        Zie verder ook de <a href="../3d">3D demos</a> en <a href="https://app.map5.nl">app.map5.nl</a>.
         Heb je ook een leuke/mooie app met OpenTopo,
         laat ons weten.
 

diff --git a/opentopo/app/opentopo.html b/opentopo/app/opentopo.html
@@ -6,10 +6,10 @@
     <meta charset="utf-8" />
     <meta name="author" content="Just van den Broecke">
 
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
+    <link rel="stylesheet" href="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
     <link rel="stylesheet" href="leaflet-gps-1.0.0/leaflet-gps.min.css" />
 
-    <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+    <script src="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
     <!-- by https://github.com/stefanocudini/leaflet-gps  -->
     <script src="leaflet-gps-1.0.0/leaflet-gps.min.js"></script>
     <style>
@@ -30,7 +30,7 @@
     var map = L.map('map');
     map.setView([52.312, 5.6], 9);
     // var mapUrl = 'http://4umaps.eu/{z}/{x}/{y}.png';
-    var mapUrl = 'http://s.map5.nl/map/gast/tiles/opentopo/EPSG900913/{z}/{x}/{y}.jpeg';
+    var mapUrl = 'https://s.map5.nl/map/gast/tiles/opentopo/EPSG900913/{z}/{x}/{y}.jpeg';
 
     // Voeg kaart toe
     L.tileLayer(mapUrl, {

diff --git a/opentopo/app/opentopord.html b/opentopo/app/opentopord.html
@@ -6,9 +6,9 @@
     <meta charset="utf-8"/>
     <meta name="author" content="Just van den Broecke, proj4leaflet by Bart van den Eijnden">
 
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css"/>
+    <link rel="stylesheet" href="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css"/>
     <!--[if lte IE 8]>
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.ie.css"/>
+    <link rel="stylesheet" href="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.ie.css"/>
     <![endif]-->
     <style>
         html, body {
@@ -25,7 +25,7 @@
 </head>
 <body>
 <div id="map"></div>
-<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+<script src="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
 <script src="proj4js/proj4js-compressed.js"></script>
 <!-- Thanks to Bart vd E -->
 <script src="proj4leaflet/proj4leaflet.js"></script>
@@ -39,7 +39,7 @@
             });
 
     // var url = 'http://ws.nlextract.nl/gwc/service/tms/1.0.0/opentopo@nlGridSetPDOK@png/{z}/{x}/{y}.png';
-    var url = 'http://s.map5.nl/map/gast/tms/1.0.0/opentopo/EPSG28992/{z}/{x}/{y}.jpeg';
+    var url = 'https://s.map5.nl/map/gast/tms/1.0.0/opentopo/EPSG28992/{z}/{x}/{y}.jpeg';
     var map = new L.Map('map', {
         continuousWorld: true,
         crs: RD,
@@ -50,7 +50,7 @@
                 maxZoom: 13,
                 detectRetina: false,
                 continuousWorld: true,
-                attribution: 'CC by CA <a href="http://www.opentopo.nl">OpenTopo</a> - <a href=http://openstreetmap.org>OpenStreetMap</a>'
+                attribution: 'CC by CA <a href="http://www.opentopo.nl">OpenTopo</a> - <a href=https://openstreetmap.org>OpenStreetMap</a>'
             })
         ],
         center: new L.LatLng(52, 5.3),

diff --git a/opentopo/app/wandel.html b/opentopo/app/wandel.html
@@ -6,10 +6,10 @@
     <meta charset="utf-8" />
     <meta name="author" content="Just van den Broecke">
 
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
+    <link rel="stylesheet" href="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
     <link rel="stylesheet" href="leaflet-gps-1.0.0/leaflet-gps.min.css" />
 
-    <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+    <script src="https://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
     <!-- by https://github.com/stefanocudini/leaflet-gps  -->
     <script src="leaflet-gps-1.0.0/leaflet-gps.min.js"></script>
 
@@ -39,12 +39,12 @@
     // Layer defs
     var opentopo = L.tileLayer(
         // 'http://ws.nlextract.nl/gwc/service/tms/1.0.0/opentopo@EPSG:900913@png/{z}/{x}/{y}.png',
-        'http://s.map5.nl/map/gast/tiles/opentopo/EPSG900913/{z}/{x}/{y}.jpeg', {
+        'https://s.map5.nl/map/gast/tiles/opentopo/EPSG900913/{z}/{x}/{y}.jpeg', {
         // tms: true,
         maxZoom: 18,
         continuousWorld: true,
         detectRetina: false,
-        attribution: 'CC by CA <a href="http://www.opentopo.nl">OpenTopo</a> - <a href=http://openstreetmap.org>OpenStreetMap</a>'
+        attribution: 'CC by CA <a href="http://www.opentopo.nl">OpenTopo</a> - <a href=https://openstreetmap.org>OpenStreetMap</a>'
     });
 
     var eu = L.tileLayer(
@@ -91,7 +91,7 @@
          maxZoom: 16,
          continuousWorld: true,
          detectRetina: false,
-         attribution: '<a href="http://hiking.waymarkedtrails.org">hiking.waymarkedtrails.org</a>'
+         attribution: '<a href="https://hiking.waymarkedtrails.org">hiking.waymarkedtrails.org</a>'
      });
 
 //    var clouds = L.tileLayer('http://{s}.tile.openweathermap.org/map/clouds/{z}/{x}/{y}.png', {