diff --git a/ground/models/Point.php b/ground/models/Point.php index d0d7e89..dbe8465 100644 --- a/ground/models/Point.php +++ b/ground/models/Point.php @@ -67,6 +67,8 @@ class Point extends Model ORDER BY `dist` LIMIT 6;'; + $gumLat = sin(deg2rad($lng))*111-11; + var_dump($gumLat, $lat, $lng);die; $res = App::DB()->prepare($query, array(PDO::ATTR_CURSOR => PDO::CURSOR_FWDONLY)); $res->execute(array(':lat' => $lat, ':lng' => $lng, ':minLat' => $lat - 1, ':minLng' => $lng - 1, ':maxLat' => $lat + 1, ':maxLng' => $lng + 1)); diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php index d810ec0..69b9e8d 100644 --- a/ground/views/indexTemplate.php +++ b/ground/views/indexTemplate.php @@ -11,14 +11,14 @@ if (App::$user) {
-
-
-
-
+
+
+
+
-
+
diff --git a/public/css/style.css b/public/css/style.css index 7f746ce..1a62d40 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -66,6 +66,7 @@ div#control div._t {border-radius: 8px 0 0 0;border-bottom: solid 1px #666; marg div#control div._c {border-radius: 0; border-bottom: solid 1px #666; margin-bottom: 0;} div#control div._b {border-radius: 0 0 0 8px;} div#control div.space {height: 10px; background-color: transparent; padding: 0;} +div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius: 8px 0 0 0;border-bottom: solid 1px #ddd; margin-bottom: 0;} /*BOX*/ body.openBox div#box {display: block;} diff --git a/public/img/buttons/addPoint.png b/public/img/buttons/addPoint.png new file mode 100644 index 0000000..fb9a968 Binary files /dev/null and b/public/img/buttons/addPoint.png differ diff --git a/public/img/buttons/layers.png b/public/img/buttons/layers.png new file mode 100644 index 0000000..97ec6aa Binary files /dev/null and b/public/img/buttons/layers.png differ diff --git a/public/img/buttons/myPosition.png b/public/img/buttons/myPosition.png new file mode 100644 index 0000000..038f20f Binary files /dev/null and b/public/img/buttons/myPosition.png differ diff --git a/public/img/buttons/route.png b/public/img/buttons/route.png new file mode 100644 index 0000000..062ea9b Binary files /dev/null and b/public/img/buttons/route.png differ diff --git a/public/img/buttons/search.png b/public/img/buttons/search.png new file mode 100644 index 0000000..5e99af7 Binary files /dev/null and b/public/img/buttons/search.png differ diff --git a/source/icons.svg b/source/icons.svg index 0775f7d..da326b2 100644 --- a/source/icons.svg +++ b/source/icons.svg @@ -95,27 +95,31 @@ + id="grid3122" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> @@ -133,6 +137,32 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> + + + - - - + + + + + x="-2526.5076" + style="font-size:339.47021484px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#333333;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve">+ + @@ -296,11 +330,106 @@ id="g4268" style="fill:#000000" /> + + + id="g3055" + transform="matrix(0.77646065,0,0,0.77646065,-2479.8235,380.88801)"> + + + + + + + + + + + + + transform="matrix(0.50760953,0,0,0.50760953,-3574.089,110.09702)" /> + + transform="matrix(6.6616945,0,0,6.6616945,-21585.345,-1475.8551)"> + ry="26.197889" + y="362.36215" + x="-4826" + height="752" + width="752" + id="rect3880" + style="fill:#f2f2f2;stroke:none" /> + style="fill:#f2f2f2;stroke:none" + id="rect3882" + width="752" + height="752" + x="-4834" + y="1172.3622" + ry="26.197889" /> + + + + + + + + + + + + + - + ?-! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + ?-! + + + + + + + + + + +