Home Explore Help
Sign In
alarig
/
ffdn-db
forked from FFDN/ffdn-db
1
0
Fork 0
Files
Browse Source

Passage de leaflet à openlayer, TODO refaire marcher les points sur la carte

alarig 8 years ago
parent
dbcc1d8bcd
commit
a33f63f381
4 changed files with 32 additions and 12 deletions
Split View Show Diff Stats
  1. 0 9
      ffdnispdb/static/js/leaflet.js
  2. 17 2
      ffdnispdb/templates/embed_map.html
  3. 14 0
      ffdnispdb/templates/index.html
  4. 1 1
      ffdnispdb/templates/layout.html

File diff suppressed because it is too large
+ 0 - 9
ffdnispdb/static/js/leaflet.js


+ 17 - 2
ffdnispdb/templates/embed_map.html
View File 

@@ -20,18 +20,33 @@
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/flags.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/style.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/style_embed.css') }}">
 
+    <script type="text/javascript" src="{{ url_for('static', filename='js/ol.js') }}"></script>
 
     {%- endblock %}
 
   </head>
 
 <body>
 
 <div id="wrap">
 
 
-      <div id="map"></div>
 
+      <div id="map">
 
+	<script type="text/javascript">
 
+		var map = new ol.Map({
 
+			target: 'map',
 
+			layers: [
 
+				new ol.layer.Tile({
 
+					source: new ol.source.OSM()
 
+				})
 
+			],
 
+			view: new ol.View({
 
+				center: ol.proj.fromLonLat([37.41, 8.82]),
 
+				zoom: 4
 
+			})
 
+		});
 
+	</script>
 
+      </div>
 
 
 {% block script -%}
 
 <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
 
 <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
 
 <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap-select.min.js') }}"></script>
 
-<script type="text/javascript" src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
 
 <script type="text/javascript" src="{{ url_for('ispdb.site_embed_js') }}"></script>
 
 {%- endblock %}
 
 </body>

+ 14 - 0
ffdnispdb/templates/index.html
View File 

@@ -3,6 +3,20 @@
 
   <div id="homepage" class="row-fluid">
 
     <div class="span9">
 
       <div id="map"></div>
 
+	<script type="text/javascript">
 
+		var map = new ol.Map({
 
+			target: 'map',
 
+			layers: [
 
+				new ol.layer.Tile({
 
+					source: new ol.source.OSM()
 
+				})
 
+			],
 
+			view: new ol.View({
 
+				center: ol.proj.fromLonLat([3.164, 46.815]),
 
+				zoom: 5
 
+			})
 
+		});
 
+	</script>
 
     </div>
 
     <div class="span3">
 
       <div class="well well-large" style="padding: 10px;">

+ 1 - 1
ffdnispdb/templates/layout.html
View File 

@@ -19,6 +19,7 @@
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/leaflet.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/flags.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/style.css') }}">
 
+    <script type="text/javascript" src="{{ url_for('static', filename='js/ol.js') }}"></script>
 
     {%- endblock %}
 
   </head>
 
 <body>
 
@@ -105,7 +106,6 @@
 
 <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
 
 <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
 
 <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap-select.min.js') }}"></script>
 
-<script type="text/javascript" src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
 
 <script type="text/javascript" src="{{ url_for('ispdb.site_js') }}"></script>
 
 {%- endblock %}
 
 </body>