Skip to content

Commit

Permalink
Use minified LeafletDraw. Fixes #1474
Browse files Browse the repository at this point in the history
  • Loading branch information
Gnafu committed Feb 16, 2017
1 parent 7d03732 commit 80b2f84
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 16 deletions.
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{json,yml,md}]
[*.{json,yml}]
indent_size = 2

[*.md]
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion docs/developer-guide/how-to-use-a-cdn.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The LeafletDraw plugin and the MapStore2 theme are linked via rawgit.com but in production it should be used a proper CDN.
Once you have a stable version:
- upload the [LeafletDraw plugin](http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/) and the [MapStore2 theme](https://github.com/geosolutions-it/MapStore2-theme/tree/master/theme/default) on your CDN
- upload the [LeafletDraw plugin](http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/) and the [MapStore2 theme](https://github.com/geosolutions-it/MapStore2-theme/tree/master/theme/default) on your CDN
- edit the [index.html](https://github.com/geosolutions-it/MapStore2/blob/master/web/client/index.html) file to use your published resources.
4 changes: 2 additions & 2 deletions project/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>__PROJECTDESCRIPTION__</title>
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="assets/css/mapstore2.css">
<script src="http://maps.google.com/maps/api/js?v=3"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>

</head>
Expand Down
4 changes: 2 additions & 2 deletions web/client/examples/api/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="https://rawgit.com/geosolutions-it/MapStore2-theme/master/theme/default/css/css.css">
Expand All @@ -15,7 +15,7 @@
<script src="http://maps.google.com/maps/api/js?v=3"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
<script src="../../libs/Cesium/Build/Cesium/Cesium.js"></script>
<link rel="stylesheet" href="../../libs/Cesium/Build/Cesium/Widgets/widgets.css" />
Expand Down
4 changes: 2 additions & 2 deletions web/client/examples/plugins/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<script src="http://maps.google.com/maps/api/js?v=3"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
<script src="../../libs/Cesium/Build/Cesium/Cesium.js"></script>
<link rel="stylesheet" href="../../libs/Cesium/Build/Cesium/Widgets/widgets.css" />
Expand Down
4 changes: 2 additions & 2 deletions web/client/examples/queryform/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>QueryForm</title>
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.css"/>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.12/proj4.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js">
</script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.js"></script>
<style>
html, body, #container {
position:absolute;
Expand Down
4 changes: 2 additions & 2 deletions web/client/examples/rasterstyler/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Raster Styler</title>
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<script src="http://maps.google.com/maps/api/js?v=3"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
<script src="http://unpkg.com/[email protected]/build/pdf.combined.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion web/client/examples/styler/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Styler</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="https://rawgit.com/geosolutions-it/MapStore2-theme/master/theme/default/css/css.css">
Expand Down
2 changes: 1 addition & 1 deletion web/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<script src="http://maps.google.com/maps/api/js?v=3"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw-src.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
<!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->
</head>
Expand Down
4 changes: 2 additions & 2 deletions web/client/simple.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>MapStore 2 HomePage</title>
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw.css" />
<link rel="stylesheet" href="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<script src="http://maps.google.com/maps/api/js?v=3"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
<script src="http://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
</head>
<body>
Expand Down

0 comments on commit 80b2f84

Please sign in to comment.