Commit d371d80e authored by Florian Barth's avatar Florian Barth
Browse files

update js+html

parent 1369b37a
......@@ -3,7 +3,6 @@
<head>
<title>Europe</title>
<meta charset="utf-8" />
<!--<link rel="stylesheet" href="https://d19vzq90twjlae.cloudfront.net/leaflet-0.7/leaflet.css" />-->
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
crossorigin=""/>
......
......@@ -490,22 +490,22 @@ function setMarker(type, color) {
//Init Map
var map = L.map('mapid').setView([48.856667, 2.351667], 5);
//Traditional
//Wikimedia
var Wikimedia = L.tileLayer('https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}{r}.png', {
attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia</a>',
minZoom: 1,
//Minimal
//Carto DB No Labels
var CartoDB_PositronNoLabels = L.tileLayer('https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{r}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
subdomains: 'abcd',
maxZoom: 19
});
//Minimal
//Traditional
//Carto DB
var CartoDB_Positron = L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
subdomains: 'abcd',
minZoom: 1,
maxZoom: 19
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
subdomains: 'abcd',
minZoom: 12,
maxZoom: 19
}).addTo(map);
//Overlay Name
......@@ -513,10 +513,10 @@ var franceLabel = overlayName("france", lang);
var hreLabel = overlayName("hrr", lang);
//Layer Groups
//Base Maps
//Base Maps Container
var baseMaps = {
"Wikimedia": Wikimedia,
"Carto DB" : CartoDB_Positron
"Carto DB" : CartoDB_Positron,
"Carto DB No Labels": CartoDB_PositronNoLabels
};
//Overlay Maps
......
......@@ -416,16 +416,16 @@ function setMarker(type, color) {
//Init Map
var map = L.map('mapid').setView([48.856667, 2.351667], 5);
//Traditional
//Wikimedia
var Wikimedia = L.tileLayer('https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}{r}.png', {
attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia</a>',
minZoom: 12,
//Minimal
//Carto DB No Labels
var CartoDB_PositronNoLabels = L.tileLayer('https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{r}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
subdomains: 'abcd',
maxZoom: 19
});
//Minimal
//Traditional
//Carto DB
var CartoDB_Positron = L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
......@@ -437,8 +437,8 @@ var CartoDB_Positron = L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/
//Layer Groups
//Base Maps Container
var baseMaps = {
"Wikimedia": Wikimedia,
"Carto DB" : CartoDB_Positron
"Carto DB" : CartoDB_Positron,
"Carto DB No Labels": CartoDB_PositronNoLabels
};
//Overlay Maps Container
......@@ -455,7 +455,7 @@ var overlayMaps = {
//Image Overlay
var imageUrl = 'https://vwestric.github.io/paris-project/raster/parisBW.png',
imageBounds = [[48.876,2.303], [48.831,2.386]];
var imageOverlay = L.imageOverlay(imageUrl, imageBounds, opacity=0.7).addTo(map);
var imageOverlay = L.imageOverlay(imageUrl, imageBounds, opacity=0.7);
map.fitBounds(imageBounds);
imageOverlay.setStyle({
opacity: 0.7
......@@ -493,7 +493,6 @@ d === "Gärten" ? 'https://vwestric.github.io/paris-project/svg/garden.svg' :
d === "Städte" ? 'https://vwestric.github.io/paris-project/svg/marker.svg' :
d === "Sonstige" ? 'https://vwestric.github.io/paris-project/svg/circle.svg' :
'https://vwestric.github.io/paris-project/svg/circle.svg';
'https://vwestric.github.io/paris-project/svg/circle.svg';
}
......
......@@ -3,7 +3,6 @@
<head>
<title>Paris</title>
<meta charset="utf-8" />
<!--<link rel="stylesheet" href="https://d19vzq90twjlae.cloudfront.net/leaflet-0.7/leaflet.css" />-->
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
crossorigin=""/>
......@@ -11,8 +10,6 @@
integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew=="
crossorigin=""></script>
<script src="js/leaflet-providers.js"></script>
<script src="https://unpkg.com/georaster"></script>
<script src="https://unpkg.com/georaster-layer-for-leaflet/georaster-layer-for-leaflet.browserify.min.js"></script>
<style>
body {
padding: 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment