From 1f3d86424980390ced9851d621fd4cd22cec1385 Mon Sep 17 00:00:00 2001 From: Philip Schell Date: Fri, 30 Aug 2019 15:04:51 +0200 Subject: [PATCH] =?UTF-8?q?#15=20suche=20nach=20st=C3=A4nden=20einbauen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG | 1 + Lora-Map/Lora-Map.csproj | 3 ++ Lora-Map/resources/css/global.css | 45 ++++++++++++++++++++++++ Lora-Map/resources/css/icons/search.png | Bin 0 -> 1431 bytes Lora-Map/resources/index.html | 7 ++++ Lora-Map/resources/js/map.js | 7 +++- Lora-Map/resources/js/menu.js | 18 ++++++++++ 7 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 Lora-Map/resources/css/icons/search.png diff --git a/CHANGELOG b/CHANGELOG index 762705a..4cc8a11 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ * #28 Fightdedection Plygon on Map * #27 Draw Camera-Desity bock on map * #16 filter nach kategorien/tracker einbauen +* #15 suche nach ständen einbauen ### Bugfixes * Add Correct Dispose Handling * TimeCalculation now handle negative values correct diff --git a/Lora-Map/Lora-Map.csproj b/Lora-Map/Lora-Map.csproj index af91716..216558a 100644 --- a/Lora-Map/Lora-Map.csproj +++ b/Lora-Map/Lora-Map.csproj @@ -111,6 +111,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/Lora-Map/resources/css/global.css b/Lora-Map/resources/css/global.css index 3a8d345..57a9bff 100644 --- a/Lora-Map/resources/css/global.css +++ b/Lora-Map/resources/css/global.css @@ -74,6 +74,9 @@ object { #menucollumn .weather.ac { background-image: url("icons/storm-ac.png"); } +#menucollumn .suche { + background-image: url("icons/search.png"); +} #pannels { position: absolute; @@ -271,6 +274,48 @@ object { width: 235px; } +#pannels #pannels_suche { + display: none; + padding: 5px; +} +#pannels #pannels_suche .searchtitle { + font-weight: bold; + font-size: 13px; +} +#pannels #pannels_suche input { + width: 220px; + margin-top: 5px; +} +#pannels #pannels_suche #search_results { + border-top: 1px solid black; + margin-top: 10px; + padding-top: 10px; +} +#pannels #pannels_suche #search_results .result { + background-color: rgba(0,0,0,0.2); + margin-bottom: 5px; + cursor: pointer; +} +#pannels #pannels_suche #search_results .result .text { + display: inline-block; + width: 200px; +} +#pannels #pannels_suche #search_results .result .text .title { + font-weight: bold; + display: block; +} +#pannels #pannels_suche #search_results .result .text .desc { + display: block; +} +#pannels #pannels_suche #search_results .result .box { + display: inline-block; + height: 25px; + width: 15px; + border-style: solid; + border-width: 2px; + vertical-align: top; +} + #overlays #cameracount { position: absolute; top: 10px; diff --git a/Lora-Map/resources/css/icons/search.png b/Lora-Map/resources/css/icons/search.png new file mode 100644 index 0000000000000000000000000000000000000000..2c622d0ba6fc0804b239437d2c8c2a9093336f88 GIT binary patch literal 1431 zcmV;I1!($-P)|4?ggs7~`8y8e(DqB|(EpO~4q4K0zuC1X#Xpg+^%YhE11lOWXap zcjnFI})p)W^Na_`gb%WuljMU+b^6xT+3kDQr zOhnTz>+k8TOXqb^pjbYDq0xzbLh!ddr7hRjklHL}KLSR*-K|Y0{u6*}x28ISHvQ}> z-7w=ROk_>+azahUW+^!B>Pm}4RfeqT6%|~qUS>CjZIl5Z0DGM@+Z~BCWF8yf+O4V1 zkd5<`Sgi+ld;K+*K|8&?i?OWhlp6Xt||n_7AUnDY|cOgWHlk{-zy0bAqcv-rJ1+c93e*R z(+$ryd{{KV(CEZIY3QAlr|9$Zsk9TY!nNfNsvUuffOx>bH-tY^4+dG|VBm#%bOZ3g zSXXyz!}&r1_|nU*g85E%l-i=hJwW#Q=bV6%LS+svH2OU0oTp1qA;)^;3E3{V2sVBmsa3>k0k9^83>N^PGGt9_bMK5RLzt1pMGpY=A(UuC(1wx) z0~k;g09I6RC6$IWgt3%Ds)*X(2hgmv2IH*1U;xHM6aZE)vm2!{kKNfUfk8)5o$niH zQb!5~NV}{bz)09eS$j1fU93GnN(_)2>&P*Nph4p=uU&bmV1S;^x-=N|0-&x&t33$1 zSS-NuFgsTjU@d7+s(=V=E5?=sz+6Ay3jkZ1d0UNxfkKQKAe+N%V0|rZ$VwkDIKH{F z=}a*I^W88SjhDEk)DIv60I>{RIh$ZL258D>XbB8%tRtr?z*;h%f-8L_CT3;G!gD)b zTw8Dn9{3@NMx(Y@()bZE+6}-0fLTRj<5?DqXGq$DQ+)^}^&vDng6fPRq+HKu#E#v* zGxHKa4v4bVM|XY+-@mr)z|g^>0CF0*9$!D#)jAf=X+u!HhSC~DNZ3|j>*mg;GsjO3 z*83JarUt$WhDU$t;0(xk*t2#2&?iL$E%gUPKur~gQiP0)FSdUD`}6=^bk^%t0;T@}f(+cf*Ao>HY|H_tc zhi7sFJfDMqs~fGuYlMX{0FWNRbLacY^U|?S9(nJXCvpQzk^ulXv~x|VCEXFNsTO!B z6E`$i&ujY!N0$r$0Q$DCT&6hx!)Pj72tkCnR{Yf^1pt6UJKI(WX$Fmkvk)SirPE6e z002kdShY5z*f~RF0e~G~;DW)IB$s3pF4VT~Zd|fLtcP(J08of5!l lOG|!$2u};aPO}oc{TB(+q0lE5Wl;bC002ovPDHLkV1njrcN_o! literal 0 HcmV?d00001 diff --git a/Lora-Map/resources/index.html b/Lora-Map/resources/index.html index 0c26246..90f4854 100644 --- a/Lora-Map/resources/index.html +++ b/Lora-Map/resources/index.html @@ -12,6 +12,7 @@ +
+ Standnummer:
+ +
+
diff --git a/Lora-Map/resources/js/map.js b/Lora-Map/resources/js/map.js index 2a08bf0..cb821fd 100644 --- a/Lora-Map/resources/js/map.js +++ b/Lora-Map/resources/js/map.js @@ -1,5 +1,6 @@ var MapObject = { Map: {}, + GeoJson: {}, _FightDedection: {}, _DensityAreas: {}, _SpecialMarkers: new Array(), @@ -77,7 +78,7 @@ var box = this._FightDedection[cameraid]; var diff = FunctionsObject.TimeCalculation(fight["LastUpdate"], "diffraw"); if (diff <= 10 && box.options.color === "black") { - box.setStyle({ color: 'rgb(' + fight["FightProbability"]*255+',0,0)' }); + box.setStyle({ color: 'rgb(' + fight["FightProbability"] * 255 + ',0,0)' }); } else if (diff <= 10 && box.options.color !== "black") { if (diff % 2 === 0) { box.setStyle({ color: 'rgb(' + fight["FightProbability"] * 255 + ',0,0)' }); @@ -120,6 +121,7 @@ }, _ParseAJAXGeo: function (geo) { if (!(Object.keys(geo).length === 0 && geo.constructor === Object)) { + this.GeoJson = geo; L.geoJSON(geo, { style: function (features) { return { @@ -254,5 +256,8 @@ }, _HidePanel: function (e) { MenuObject.ShowHidePanel(null); + }, + JumpTo: function (lat, lon) { + this.Map.flyTo([lat, lon], 19); } }.Start(); \ No newline at end of file diff --git a/Lora-Map/resources/js/menu.js b/Lora-Map/resources/js/menu.js index a72cf85..62a2249 100644 --- a/Lora-Map/resources/js/menu.js +++ b/Lora-Map/resources/js/menu.js @@ -197,5 +197,23 @@ document.getElementById("pannels_weather").innerHTML = "

Keine Gefahren

"; document.getElementById("menucol_weather_icon").className = "weather"; } + }, + SearchInGeoJson: function (searchtext) { + var html = ""; + if (MapObject.GeoJson.features.length > 0) { + for (var i = 0; i < MapObject.GeoJson.features.length; i++) { + var feature = MapObject.GeoJson.features[i]; + if (feature.properties.name.indexOf(searchtext) !== -1 && feature.geometry.type === "Polygon") { + if (feature.geometry.coordinates.length > 0 && feature.geometry.coordinates[0].length > 0 && feature.geometry.coordinates[0][0].length > 0) { + html += "
" + + "" + feature.properties.name + "" + + "" + (typeof feature.properties.description !== "undefined" ? feature.properties.description : "") + "" + + "" + + "
"; + } + } + } + } + document.getElementById("search_results").innerHTML = html; } }.Start(); \ No newline at end of file