Merge branch 'master' into devel

geoapi/insert/createPlaceNewsInsert.php

@@ -0,0 +1,8 @@
+<?php
+$file = "placealias.json";
+$json = json_decode(file_get_contents($file),true);
+foreach ($json as $row) {
+
+    echo "INSERT INTO `placeservice`(`pid`, `sid`, `request`) VALUES (".$row["pid"].",2,'/p/".$row["alias"]."');\n";
+}
+?>

geoapi/insert/loadcvs.php

@@ -4,7 +4,7 @@
  * @author stubbfel
  * @since 01.07.2013
  */
-if (($handle = fopen(utf8_decode("../../map/campus-senftenberg-gebäude.csv"), "r")) !== FALSE) {
+if (($handle = fopen(utf8_decode("../../map/campus-cottbus-mitte-gebäude.csv"), "r")) !== FALSE) {
     $firstRow = true;
     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
 
@@ -16,7 +16,7 @@ if (($handle = fopen(utf8_decode("../../map/campus-senftenberg-gebäude.csv"), "
         $id = $data[1];        
         $name = $data[2];
         $typ = $data[3];
-        $insetPlace = "INSERT INTO `place`(`id`, `plan`,parent) VALUES ($id,GeomFromText('$plan'),-3);\n";
+        $insetPlace = "INSERT INTO `place`(`id`, `plan`,parent) VALUES ($id,GeomFromText('$plan'),1);\n";
         $insertAlias = "INSERT INTO `placealias`(`pid`, `alias`) VALUES ($id,$id);\n";
         $insertDomain = "INSERT INTO `placedomain`(`pid`, `did`) VALUES ($id,1);\n";
         $insertName = "";

geoapi/insert/placealias.json

@@ -0,0 +1 @@
+[{"aid": 77,"pid": 129140556,"alias": 129140556}, {"aid": 78,"pid": 129140566,"alias": 129140566}, {"aid": 79,"pid": 129357942,"alias": 129357942}, {"aid": 80,"pid": 129357943,"alias": 129357943}, {"aid": 81,"pid": 129357944,"alias": 129357944}, {"aid": 82,"pid": 129357945,"alias": 129357945}, {"aid": 83,"pid": 129357946,"alias": 129357946}, {"aid": 84,"pid": 129357947,"alias": 129357947}, {"aid": 85,"pid": 129357949,"alias": 129357949}, {"aid": 86,"pid": 129357950,"alias": 129357950}, {"aid": 87,"pid": 129357951,"alias": 129357951}, {"aid": 88,"pid": 129357952,"alias": 129357952}, {"aid": 89,"pid": 121799787,"alias": 121799787}, {"aid": 90,"pid": 127003463,"alias": 127003463}, {"aid": 91,"pid": 127003745,"alias": 127003745}, {"aid": 92,"pid": 127003746,"alias": 127003746}, {"aid": 93,"pid": 127010188,"alias": 127010188}, {"aid": 94,"pid": 127010189,"alias": 127010189}, {"aid": 95,"pid": 127010192,"alias": 127010192}, {"aid": 96,"pid": 127010225,"alias": 127010225}, {"aid": 97,"pid": 127010228,"alias": 127010228}, {"aid": 98,"pid": 145126872,"alias": 145126872}, {"aid": 99,"pid": 145126874,"alias": 145126874}, {"aid": 100,"pid": 145126875,"alias": 145126875}, {"aid": 101,"pid": 145128359,"alias": 145128359}, {"aid": 102,"pid": 145128360,"alias": 145128360}, {"aid": 103,"pid": 145128368,"alias": 145128368}, {"aid": 104,"pid": 145128369,"alias": 145128369}, {"aid": 105,"pid": 145128371,"alias": 145128371}, {"aid": 106,"pid": 145128378,"alias": 145128378}, {"aid": 107,"pid": 145128380,"alias": 145128380}, {"aid": 108,"pid": 145130526,"alias": 145130526}, {"aid": 109,"pid": 145130527,"alias": 145130527}, {"aid": 110,"pid": 145130528,"alias": 145130528}, {"aid": 111,"pid": 145130530,"alias": 145130530}, {"aid": 112,"pid": 145130531,"alias": 145130531}, {"aid": 113,"pid": 145130533,"alias": 145130533}, {"aid": 114,"pid": 129258388,"alias": 129258388}, {"aid": 115,"pid": 145132458,"alias": 145132458}, {"aid": 116,"pid": 129258396,"alias": 129258396}, {"aid": 117,"pid": 145132460,"alias": 145132460}, {"aid": 118,"pid": 145132464,"alias": 145132464}, {"aid": 119,"pid": 149292698,"alias": 149292698}, {"aid": 120,"pid": 177247686,"alias": 177247686}, {"aid": 121,"pid": 145271909,"alias": 145271909}, {"aid": 122,"pid": 145271910,"alias": 145271910}, {"aid": 123,"pid": 145271920,"alias": 145271920}, {"aid": 124,"pid": 145280191,"alias": 145280191}, {"aid": 125,"pid": 145280193,"alias": 145280193}, {"aid": 126,"pid": 129140526,"alias": 129140526}, {"aid": 127,"pid": 145280213,"alias": 145280213}, {"aid": 128,"pid": 145130529,"alias": 145130529}, {"aid": 129,"pid": 145130532,"alias": 145130532}, {"aid": 130,"pid": 129258513,"alias": 129258513}, {"aid": 131,"pid": 179989851,"alias": 179989851}, {"aid": 132,"pid": 145271897,"alias": 145271897}, {"aid": 133,"pid": 145271902,"alias": 145271902}, {"aid": 134,"pid": 145271906,"alias": 145271906}, {"aid": 135,"pid": 145128365,"alias": 145128365}, {"aid": 136,"pid": 25091388,"alias": 25091388}, {"aid": 137,"pid": 25091389,"alias": 25091389}, {"aid": 138,"pid": 25091390,"alias": 25091390}, {"aid": 139,"pid": 25091391,"alias": 25091391}, {"aid": 140,"pid": 183190820,"alias": 183190820}, {"aid": 141,"pid": 183190822,"alias": 183190822}, {"aid": 142,"pid": 126565095,"alias": 126565095}, {"aid": 143,"pid": 141509869,"alias": 141509869}, {"aid": 144,"pid": 141509871,"alias": 141509871}, {"aid": 145,"pid": 141509873,"alias": 141509873}, {"aid": 146,"pid": 141509874,"alias": 141509874}, {"aid": 147,"pid": 141509875,"alias": 141509875}, {"aid": 148,"pid": 141509876,"alias": 141509876}, {"aid": 149,"pid": 141509877,"alias": 141509877}, {"aid": 150,"pid": 141509893,"alias": 141509893}, {"aid": 151,"pid": 89552667,"alias": 89552667}, {"aid": 152,"pid": 89552669,"alias": 89552669}, {"aid": 153,"pid": 89552670,"alias": 89552670}, {"aid": 154,"pid": 89552675,"alias": 89552675}, {"aid": 155,"pid": 89552676,"alias": 89552676}, {"aid": 156,"pid": 98446004,"alias": 98446004}, {"aid": 157,"pid": 140400852,"alias": 140400852}, {"aid": 158,"pid": 140400854,"alias": 140400854}, {"aid": 159,"pid": 173777125,"alias": 173777125}, {"aid": 160,"pid": 173780283,"alias": 173780283}, {"aid": 161,"pid": 173780284,"alias": 173780284}, {"aid": 162,"pid": 173780285,"alias": 173780285}, {"aid": 163,"pid": 173780286,"alias": 173780286}, {"aid": 164,"pid": 173780289,"alias": 173780289}, {"aid": 165,"pid": 173780291,"alias": 173780291}, {"aid": 166,"pid": 173780296,"alias": 173780296}, {"aid": 167,"pid": 173780298,"alias": 173780298}, {"aid": 168,"pid": 4,"alias": 4}, {"aid": 169,"pid": 1,"alias": 1}, {"aid": 170,"pid": 2,"alias": 2}, {"aid": 171,"pid": 3,"alias": 3}]

geoapi/insert/showallRooms.php

@@ -0,0 +1,11 @@
+<?php
+header('Content-Type: text/html; charset=utf-8');
+$file = "placeinformation.json";
+$json = json_decode(file_get_contents($file),true);
+foreach ($json as $row) {
+
+    if ($row["iid"] == 3) {    
+        echo "<a href=\"http://141.43.76.140:8080/p/".$row["pid"]."\">".$row["value"]."</a><br>";
+    }
+}
+?>

map/brandenburg-latest.shp/README

@@ -2,10 +2,10 @@ The files in this archive have been created from OpenStreetMap data
 and are licensed under the Open Database 1.0 License. See 
 www.openstreetmap.org for details about the project.
 
-This file contains OpenStreetMap data as of 2013-07-23T19:00:01Z. Every day
+This file contains OpenStreetMap data as of 2013-08-13T19:00:01Z. Every day
 a new version of this file will be made available at:
 
-http://download.geofabrik.de/osm/europe/germany/brandenburg-130723.shp.zip
+http://download.geofabrik.de/osm/europe/germany/brandenburg-130813.shp.zip
 
 Geofabrik also makes extended shapefiles to order; please see
 http://www.geofabrik.de/data/shapefiles.html for details and example

map/btucscampus.qgs

@@ -4,10 +4,10 @@
     <mapcanvas>
         <units>degrees</units>
         <extent>
-            <xmin>14.191382</xmin>
-            <ymin>51.659713</ymin>
-            <xmax>14.478726</xmax>
-            <ymax>51.804868</ymax>
+            <xmin>14.320259</xmin>
+            <ymin>51.765855</ymin>
+            <xmax>14.322504</xmax>
+            <ymax>51.766989</ymax>
         </extent>
         <projections>0</projections>
         <destinationsrs>
@@ -24,57 +24,57 @@
         </destinationsrs>
     </mapcanvas>
     <legend updateDrawingOrder="false">
-        <legendlayer drawingOrder="-1" open="true" checked="Qt::Unchecked" name="roads" showFeatureCount="0">
+        <legendlayer drawingOrder="0" open="true" checked="Qt::Unchecked" name="roads" showFeatureCount="0">
             <filegroup open="true" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="roads20130724135342476" visible="0"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="true" checked="Qt::Unchecked" name="buildings" showFeatureCount="0">
+        <legendlayer drawingOrder="1" open="true" checked="Qt::Unchecked" name="buildings" showFeatureCount="0">
             <filegroup open="true" hidden="false">
-                <legendlayerfile isInOverview="0" layerid="buildings20130724135323515" visible="0"/>
+                <legendlayerfile isInOverview="0" layerid="buildings20130814151114116" visible="0"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="campus-cottbus-süd-strassen" showFeatureCount="0">
+        <legendlayer drawingOrder="2" open="false" checked="Qt::Unchecked" name="campus-cottbus-süd-strassen" showFeatureCount="0">
             <filegroup open="false" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_cottbus_süd_strassen20130709114947810" visible="0"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="campus-cottbus-mitte-strassen" showFeatureCount="0">
+        <legendlayer drawingOrder="3" open="false" checked="Qt::Unchecked" name="campus-cottbus-mitte-strassen" showFeatureCount="0">
             <filegroup open="false" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_cottbus_mitte_strassen20130709115740721" visible="0"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="campus-senftenberg-strassen" showFeatureCount="0">
+        <legendlayer drawingOrder="4" open="false" checked="Qt::Unchecked" name="campus-senftenberg-strassen" showFeatureCount="0">
             <filegroup open="false" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_senftenberg_strassen20130709121948701" visible="0"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="true" checked="Qt::Unchecked" name="campus-cottbus-nord-strassen" showFeatureCount="0">
+        <legendlayer drawingOrder="5" open="true" checked="Qt::Unchecked" name="campus-cottbus-nord-strassen" showFeatureCount="0">
             <filegroup open="true" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_cottbus_nord_strassen20130709130942093" visible="0"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="false" checked="Qt::Checked" name="campus-cottbus-mitte-gebäude" showFeatureCount="0">
-            <filegroup open="false" hidden="false">
+        <legendlayer drawingOrder="6" open="true" checked="Qt::Checked" name="campus-cottbus-mitte-gebäude" showFeatureCount="0">
+            <filegroup open="true" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_cottbus_mitte_gebäude20130709104921649" visible="1"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="false" checked="Qt::Checked" name="campus-cottbus-süd-gebäude" showFeatureCount="0">
+        <legendlayer drawingOrder="7" open="false" checked="Qt::Checked" name="campus-cottbus-süd-gebäude" showFeatureCount="0">
             <filegroup open="false" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_cottbus_süd_gebäude20130709114420373" visible="1"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="false" checked="Qt::Checked" name="campus-senftenberg-gebäude" showFeatureCount="0">
+        <legendlayer drawingOrder="8" open="false" checked="Qt::Checked" name="campus-senftenberg-gebäude" showFeatureCount="0">
             <filegroup open="false" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_senftenberg_gebäude20130709121511731" visible="1"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="campus-cottbus-nord-gebäude" showFeatureCount="0">
+        <legendlayer drawingOrder="9" open="true" checked="Qt::Checked" name="campus-cottbus-nord-gebäude" showFeatureCount="0">
             <filegroup open="true" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campus_cottbus_nord_gebäude20130709130745659" visible="1"/>
             </filegroup>
         </legendlayer>
-        <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="campuse" showFeatureCount="0">
+        <legendlayer drawingOrder="10" open="true" checked="Qt::Checked" name="campuse" showFeatureCount="0">
             <filegroup open="true" hidden="false">
                 <legendlayerfile isInOverview="0" layerid="campuse20130709122450377" visible="1"/>
             </filegroup>
@@ -82,7 +82,7 @@
     </legend>
     <projectlayers layercount="11">
         <maplayer minimumScale="0" maximumScale="1e+08" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0">
-            <id>buildings20130724135323515</id>
+            <id>buildings20130814151114116</id>
             <datasource>./brandenburg-latest.shp/buildings.shp</datasource>
             <title></title>
             <abstract></abstract>
@@ -106,7 +106,7 @@
                 <symbols>
                     <symbol outputUnit="MM" alpha="1" type="fill" name="0">
                         <layer pass="0" class="SimpleFill" locked="0">
-                            <prop k="color" v="129,60,18,255"/>
+                            <prop k="color" v="58,178,96,255"/>
                             <prop k="color_border" v="0,0,0,255"/>
                             <prop k="offset" v="0,0"/>
                             <prop k="style" v="solid"/>
@@ -119,7 +119,7 @@
                 <sizescale field=""/>
             </renderer-v2>
             <customproperties/>
-            <displayfield></displayfield>
+            <displayfield>name</displayfield>
             <label>0</label>
             <labelattributes>
                 <label fieldname="" text="Beschriftung"/>
@@ -141,9 +141,9 @@
                 <multilineenabled fieldname="" on=""/>
                 <selectedonly on=""/>
             </labelattributes>
-            <editform></editform>
+            <editform>.</editform>
             <editforminit></editforminit>
-            <annotationform></annotationform>
+            <annotationform>.</annotationform>
             <attributeactions/>
         </maplayer>
         <maplayer minimumScale="0" maximumScale="1e+08" geometry="Polygon" type="vector" hasScaleBasedVisibilityFlag="0">
@@ -795,7 +795,7 @@
                 <sizescale field=""/>
             </renderer-v2>
             <customproperties/>
-            <displayfield></displayfield>
+            <displayfield>name</displayfield>
             <label>0</label>
             <labelattributes>
                 <label fieldname="" text="Beschriftung"/>
@@ -817,9 +817,9 @@
                 <multilineenabled fieldname="" on=""/>
                 <selectedonly on=""/>
             </labelattributes>
-            <editform></editform>
+            <editform>.</editform>
             <editforminit></editforminit>
-            <annotationform></annotationform>
+            <annotationform>.</annotationform>
             <attributeactions/>
         </maplayer>
     </projectlayers>

map/campus-cottbus-mitte-gebäude.csv

@@ -58,3 +58,4 @@ WKT,osm_id,name,type
 "POLYGON ((14.3248108 51.7670716,14.3250781 51.7670377,14.3249309 51.7665912,14.324915 51.7665932,14.3249097 51.7665772,14.3249055 51.7665646,14.3249137 51.7665635,14.3249391 51.7665603,14.3248499 51.7662898,14.3245466 51.7663283,14.3246359 51.7665988,14.3246675 51.7665948,14.3246717 51.7666075,14.324677 51.7666234,14.3246636 51.7666251,14.3246902 51.7667056,14.3247191 51.7667935,14.3248108 51.7670716))",145271902,Lehrgeb<EFBFBD>ude 2A,
 "POLYGON ((14.3238298 51.7671962,14.3240971 51.7671622,14.3240052 51.7668839,14.3239763 51.766796,14.3239498 51.7667158,14.3239338 51.7667178,14.3239285 51.7667018,14.3239243 51.7666891,14.3239326 51.7666881,14.323958 51.7666849,14.3238688 51.7664143,14.3235656 51.7664528,14.3236548 51.7667234,14.3236863 51.7667193,14.3236905 51.766732,14.3236958 51.766748,14.3236825 51.7667497,14.3238298 51.7671962))",145271906,Lehrgeb<EFBFBD>ude 2B,
 "POLYGON ((14.3244513 51.768104,14.3244834 51.7682033,14.3246538 51.7681821,14.3246218 51.7680828,14.3246331 51.7680814,14.3244989 51.767666,14.3242922 51.7676917,14.3244264 51.7681071,14.3244513 51.768104))",145128365,Lehrgeb<EFBFBD>ude 1C,
+"POLYGON ((14.321407283616285 51.766245928898741,14.321982473388676 51.766173007920486,14.321950442678604 51.766081686321556,14.32189455931209 51.765927666311413,14.321339814673786 51.765995135253924,14.321407283616285 51.766245928898741))",5,MZG,Mehrzweck

map/campus-cottbus-mitte-gebäude.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

map/campus-cottbus-mitte-gebäude.qpj

@@ -1 +0,0 @@
-GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]