]> saetta.ns0.it Git - bcity/fe/commitdiff
projects / bcity / fe / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aeff7af)
Added draft of geolocation.
authorAndrea Zagli <azagli@libero.it>
Sat, 30 Jan 2016 10:44:20 +0000 (11:44 +0100)
committerAndrea Zagli <azagli@libero.it>
Sat, 30 Jan 2016 10:44:20 +0000 (11:44 +0100)
data/bcity_fe/ctpl/index_index.ctpl patch | blob | history
data/bcity_fe/ctpl/template.ctpl patch | blob | history
src/index.c patch | blob | history
src/login.c patch | blob | history

diff --git a/data/bcity_fe/ctpl/index_index.ctpl b/data/bcity_fe/ctpl/index_index.ctpl
index 1b781d148703c6d30837bcd9f1c2919daecb6410..afa0f4ad64b222fc349cb551188c4d93c57b84a8 100644 (file)
--- a/data/bcity_fe/ctpl/index_index.ctpl
+++ b/data/bcity_fe/ctpl/index_index.ctpl
@@ -1,3 +1,8 @@
 <h1>B-City</h1>
 
-<h2>Hello world!!!</h2>
\ No newline at end of file
+<div id="map" style="width: 100%; height: 600px;"></div>
+
+<form>
+       <input name="lat" id="lat" />
+       <input name="lng" id="lng" />
+</form>
\ No newline at end of file
diff --git a/data/bcity_fe/ctpl/template.ctpl b/data/bcity_fe/ctpl/template.ctpl
index 01fb7d10dcd6ca6073d9efe035358434f40dd558..c97225b282e0ca12838397402e880e0c58709a62 100644 (file)
--- a/data/bcity_fe/ctpl/template.ctpl
+++ b/data/bcity_fe/ctpl/template.ctpl
@@ -28,7 +28,7 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
-  <body>
+  <body{body_tag}>
        <div class="container">
       {body}
        </div>
diff --git a/src/index.c b/src/index.c
index 5f714565e6a28d3c2163d628833f916de3843826..16ebd0178ba5e191776412f276deea74865a0cf0 100644 (file)
--- a/src/index.c
+++ b/src/index.c
@@ -29,6 +29,7 @@ index_index (GMatchInfo *minfo, gpointer user_data)
 {
        CtplEnviron *env;
 
+       gchar *head;
        gchar *filename;
        gchar *content;
 
@@ -44,8 +45,56 @@ index_index (GMatchInfo *minfo, gpointer user_data)
        content = get_ctpl_filled (filename, NULL);
        g_free (filename);
 
+       head = g_strdup ("<link rel=\"stylesheet\" href=\"http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css\" />\n"
+"<script src=\"http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js\"></script>\n"
+"\n"
+"<script type=\"text/javascript\">\n"
+"var map;\n"
+"var ajaxRequest;\n"
+"var plotlist;\n"
+"var plotlayers=[];\n"
+"var marker;\n"
+"\n"
+"function showPosition(position) {\n"
+"    map.setView(new L.LatLng(position.coords.latitude, position.coords.longitude),13);\n"
+"}\n"
+"\n"
+"function onMapClick(e) {\n"
+"if (!marker)\n"
+"{\n"
+"marker = L.marker([e.latlng.lat, e.latlng.lng]).addTo(map);\n"
+"}\n"
+"else\n"
+"{\n"
+"marker.setLatLng([e.latlng.lat, e.latlng.lng]);\n"
+"}\n"
+"$('#lat').val(e.latlng.lat);\n"
+"$('#lng').val(e.latlng.lng);\n"
+"}\n"
+"\n"
+"function initmap() {\n"
+"    // geolocation\n"
+"    navigator.geolocation.getCurrentPosition(showPosition);\n"
+"\n"
+"    // set up the map\n"
+"      map = new L.Map('map');\n"
+"\n"
+"      // create the tile layer with correct attribution\n"
+"      var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';\n"
+"      var osmAttrib='Map data © <a href=\"http://openstreetmap.org\">OpenStreetMap</a> contributors';\n"
+"      var osm = new L.TileLayer(osmUrl, {minZoom: 8, maxZoom: 16, attribution: osmAttrib});\n"
+"\n"
+"    // start the map in South-East England\n"
+"      map.setView(new L.LatLng(51.3, 0.7),9);\n"
+"   map.addLayer(osm);\n"
+""
+"    map.on('click', onMapClick);\n"
+"}\n"
+"      </script>");
+
        env = ctpl_environ_new ();
-       ctpl_environ_push_string (env, "head", "");
+       ctpl_environ_push_string (env, "head", head);
+       ctpl_environ_push_string (env, "body_tag", " onload=\"initmap()\"");
        ctpl_environ_push_string (env, "body", content);
 
        filename = g_build_filename (commons->ctpldir, "template.ctpl", NULL);
@@ -53,5 +102,6 @@ index_index (GMatchInfo *minfo, gpointer user_data)
                                         get_ctpl_filled (filename, env));
        g_free (filename);
 
+       g_free (head);
        g_free (content);
 }
diff --git a/src/login.c b/src/login.c
index da5bd6c1179dd0262b88ad17c3c700ae0898d1c9..9a201a4b5235b206eef19541dfacb1ff8b601c21 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -118,6 +118,7 @@ login_index (GMatchInfo *minfo, gpointer user_data)
 
        env = ctpl_environ_new ();
        ctpl_environ_push_string (env, "head", "");
+       ctpl_environ_push_string (env, "body_tag", "");
        ctpl_environ_push_string (env, "body", content);
 
        filename = g_build_filename (commons->ctpldir, "template.ctpl", NULL);
Unnamed repository; edit this file 'description' to name the repository.