diff --git a/geoapi/database/PisSqlManager.php b/geoapi/database/PisSqlManager.php index 0744bc1..b7b18d4 100644 --- a/geoapi/database/PisSqlManager.php +++ b/geoapi/database/PisSqlManager.php @@ -32,11 +32,29 @@ class PisSqlManager extends SQLManager { */ public static $infValue = "iValue"; + /** + * Fieldname of the parendId + * @var string + */ + public static $parentId = "parent"; + + /** + * Fieldname of the refpoint + * @var string + */ + public static $refpoint = "refpoint"; + /** * String for the select part of the query * @var string */ - private static $selectTerm = "SELECT pid, iName, iValue FROM pis WHERE "; + private static $selectTerm = "SELECT pid, parent, refpoint, iName, iValue FROM pis WHERE "; + + /** + * String for the select all part of the query + * @var string + */ + private static $selectAllTerm = "SELECT pid, parent, refpoint, iName, iValue FROM pis "; /** * String for the orderby part of the query @@ -83,19 +101,24 @@ class PisSqlManager extends SQLManager { $query .= self::$openBracket; $query .= \utiliy\ArrayManager::toSqlWhereString($pidList, self::$orTerm, self::$pidTerm); $query .= self::$closeBracket; - } else { + } else if ($pidList[0] != "*") { return null; } if (count($iNameList) > 0 && \utiliy\ArrayManager::validAlphaNumList($iNameList)) { - $query .= self::$andTerm; + if ($query != self::$selectTerm) { + $query .= self::$andTerm; + } $query .= self::$openBracket; $query .= \utiliy\ArrayManager::toSqlWhereString($iNameList, self::$orTerm, self::$iNameTerm); $query .= self::$closeBracket; } - + + if ($query == self::$selectTerm) { + $query = self::$selectAllTerm; + } + $query .= self::$orderByTerm; - // send query return $this->query($query); } diff --git a/geoapi/database/PssSqlManager.php b/geoapi/database/PssSqlManager.php index 5360547..b7012be 100644 --- a/geoapi/database/PssSqlManager.php +++ b/geoapi/database/PssSqlManager.php @@ -38,11 +38,29 @@ class PssSqlManager extends SQLManager { */ public static $srvRequest = "request"; + /** + * Fieldname of the parendId + * @var string + */ + public static $parentId = "parent"; + + /** + * Fieldname of the refpoint + * @var string + */ + public static $refpoint = "refpoint"; + /** * String for the select part of the query * @var string */ - private static $selectTerm = "SELECT pid, sName, sap, request FROM pss WHERE "; + private static $selectTerm = "SELECT pid, parent, refpoint, sName, sap, request FROM pss WHERE "; + + /** + * String for the select all part of the query + * @var string + */ + private static $selectAllTerm = "SELECT pid, parent, refpoint, sName, sap, request FROM pss "; /** * String for the orderby part of the query @@ -89,17 +107,23 @@ class PssSqlManager extends SQLManager { $query .= self::$openBracket; $query .= \utiliy\ArrayManager::toSqlWhereString($pidList, self::$orTerm, self::$pidTerm); $query .= self::$closeBracket; - } else { + } else if ($pidList[0] != "*") { return null; } if (count($sNameList) > 0 && \utiliy\ArrayManager::validAlphaNumList($sNameList)) { - $query .= self::$andTerm; + if ($query != self::$selectTerm) { + $query .= self::$andTerm; + } $query .= self::$openBracket; $query .= \utiliy\ArrayManager::toSqlWhereString($sNameList, self::$orTerm, self::$sNameTerm); $query .= self::$closeBracket; } + if ($query == self::$selectTerm) { + $query = self::$selectAllTerm; + } + $query .= self::$orderByTerm; // send query diff --git a/geoapi/utility/JsonManager.php b/geoapi/utility/JsonManager.php index a36ddc4..1fe1b69 100644 --- a/geoapi/utility/JsonManager.php +++ b/geoapi/utility/JsonManager.php @@ -82,10 +82,12 @@ class JsonManager implements SerialManager { * @return json-string */ public static function arrayToPisJson($result) { - $infos = array(); + $infos = array(); foreach ($result as $row) { // fetch the place id of the row - $placeId = $row[\database\PisSqlManager::$placeId]; + $placeId = $row[\database\PisSqlManager::$placeId]; + $infos[$placeId][self::$parentIdName] = $row[\database\PisSqlManager::$parentId]; + $infos[$placeId][self::$refpointName] = $row[\database\PisSqlManager::$refpoint]; $infos[$placeId][$row[\database\PisSqlManager::$infName]] = utf8_encode($row[\database\PisSqlManager::$infValue]); } return json_encode($infos); @@ -103,6 +105,8 @@ class JsonManager implements SerialManager { // fetch the place id of the row $placeId = $row[\database\PssSqlManager::$placeId]; $placeSrv = array(self::$placeSapName => $row[\database\PssSqlManager::$srvSap], self::$placeRequestName => $row[\database\PssSqlManager::$srvRequest]); + $services[$placeId][self::$parentIdName] = $row[\database\PssSqlManager::$parentId]; + $services[$placeId][self::$refpointName] = $row[\database\PssSqlManager::$refpoint]; $services[$placeId][$row[\database\PssSqlManager::$srvName]] = $placeSrv; } return json_encode($services); diff --git a/geoapi/utility/XmlManager.php b/geoapi/utility/XmlManager.php index beafa12..4991ffe 100644 --- a/geoapi/utility/XmlManager.php +++ b/geoapi/utility/XmlManager.php @@ -120,6 +120,8 @@ class XmlManager implements SerialManager { $actPlace = $placeId; $place = $xml->addChild(self::$placeElementName); $place->addAttribute(self::$placeIdAttrName, $placeId); + $place->addAttribute(self::$parentIdAttrName, $row[\database\PisSqlManager::$parentId]); + $place->addAttribute(self::$refpointAttrName, $row[\database\PisSqlManager::$refpoint]); } // add placeinformation elment @@ -155,6 +157,8 @@ class XmlManager implements SerialManager { $actPlace = $placeId; $place = $xml->addChild(self::$placeElementName); $place->addAttribute(self::$placeIdAttrName, $placeId); + $place->addAttribute(self::$parentIdAttrName, $row[\database\PssSqlManager::$parentId]); + $place->addAttribute(self::$refpointAttrName, $row[\database\PssSqlManager::$refpoint]); } // add placeservice elment diff --git a/map/brandenburg-latest.shp/README b/map/brandenburg-latest.shp/README index bca6def..b1ae0a9 100644 --- a/map/brandenburg-latest.shp/README +++ b/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-08-13T19:00:01Z. Every day +This file contains OpenStreetMap data as of 2013-08-27T13:21:02Z. Every day a new version of this file will be made available at: -http://download.geofabrik.de/osm/europe/germany/brandenburg-130813.shp.zip +http://download.geofabrik.de/osm/europe/germany/brandenburg-130827.shp.zip Geofabrik also makes extended shapefiles to order; please see http://www.geofabrik.de/data/shapefiles.html for details and example diff --git a/map/brandenburg-latest.shp/buildings.dbf b/map/brandenburg-latest.shp/buildings.dbf index 0c1e001..189e504 100644 Binary files a/map/brandenburg-latest.shp/buildings.dbf and b/map/brandenburg-latest.shp/buildings.dbf differ diff --git a/map/brandenburg-latest.shp/buildings.shp b/map/brandenburg-latest.shp/buildings.shp index a3c7eab..c2acde9 100644 Binary files a/map/brandenburg-latest.shp/buildings.shp and b/map/brandenburg-latest.shp/buildings.shp differ diff --git a/map/brandenburg-latest.shp/buildings.shx b/map/brandenburg-latest.shp/buildings.shx index fbf1330..83b747a 100644 Binary files a/map/brandenburg-latest.shp/buildings.shx and b/map/brandenburg-latest.shp/buildings.shx differ diff --git a/map/brandenburg-latest.shp/landuse.dbf b/map/brandenburg-latest.shp/landuse.dbf index 26e6fa4..d7ca0c2 100644 Binary files a/map/brandenburg-latest.shp/landuse.dbf and b/map/brandenburg-latest.shp/landuse.dbf differ diff --git a/map/brandenburg-latest.shp/landuse.shp b/map/brandenburg-latest.shp/landuse.shp index 55e2a73..f0bf3e5 100644 Binary files a/map/brandenburg-latest.shp/landuse.shp and b/map/brandenburg-latest.shp/landuse.shp differ diff --git a/map/brandenburg-latest.shp/landuse.shx b/map/brandenburg-latest.shp/landuse.shx index f204b96..d484247 100644 Binary files a/map/brandenburg-latest.shp/landuse.shx and b/map/brandenburg-latest.shp/landuse.shx differ diff --git a/map/brandenburg-latest.shp/natural.dbf b/map/brandenburg-latest.shp/natural.dbf index be4fd64..6c279c1 100644 Binary files a/map/brandenburg-latest.shp/natural.dbf and b/map/brandenburg-latest.shp/natural.dbf differ diff --git a/map/brandenburg-latest.shp/natural.shp b/map/brandenburg-latest.shp/natural.shp index 8cdc278..649832e 100644 Binary files a/map/brandenburg-latest.shp/natural.shp and b/map/brandenburg-latest.shp/natural.shp differ diff --git a/map/brandenburg-latest.shp/natural.shx b/map/brandenburg-latest.shp/natural.shx index da8d8bc..a181326 100644 Binary files a/map/brandenburg-latest.shp/natural.shx and b/map/brandenburg-latest.shp/natural.shx differ diff --git a/map/brandenburg-latest.shp/places.dbf b/map/brandenburg-latest.shp/places.dbf index a4df0dd..91129fd 100644 Binary files a/map/brandenburg-latest.shp/places.dbf and b/map/brandenburg-latest.shp/places.dbf differ diff --git a/map/brandenburg-latest.shp/places.shp b/map/brandenburg-latest.shp/places.shp index 21de196..620bb55 100644 Binary files a/map/brandenburg-latest.shp/places.shp and b/map/brandenburg-latest.shp/places.shp differ diff --git a/map/brandenburg-latest.shp/places.shx b/map/brandenburg-latest.shp/places.shx index d119fde..b3590c8 100644 Binary files a/map/brandenburg-latest.shp/places.shx and b/map/brandenburg-latest.shp/places.shx differ diff --git a/map/brandenburg-latest.shp/points.dbf b/map/brandenburg-latest.shp/points.dbf index 2eda064..09e78b4 100644 Binary files a/map/brandenburg-latest.shp/points.dbf and b/map/brandenburg-latest.shp/points.dbf differ diff --git a/map/brandenburg-latest.shp/points.shp b/map/brandenburg-latest.shp/points.shp index 6338168..b8a5627 100644 Binary files a/map/brandenburg-latest.shp/points.shp and b/map/brandenburg-latest.shp/points.shp differ diff --git a/map/brandenburg-latest.shp/points.shx b/map/brandenburg-latest.shp/points.shx index 8af7bc5..0ba8b21 100644 Binary files a/map/brandenburg-latest.shp/points.shx and b/map/brandenburg-latest.shp/points.shx differ diff --git a/map/brandenburg-latest.shp/railways.dbf b/map/brandenburg-latest.shp/railways.dbf index e3bb2fd..7d90494 100644 Binary files a/map/brandenburg-latest.shp/railways.dbf and b/map/brandenburg-latest.shp/railways.dbf differ diff --git a/map/brandenburg-latest.shp/railways.shp b/map/brandenburg-latest.shp/railways.shp index caab044..663a2e3 100644 Binary files a/map/brandenburg-latest.shp/railways.shp and b/map/brandenburg-latest.shp/railways.shp differ diff --git a/map/brandenburg-latest.shp/railways.shx b/map/brandenburg-latest.shp/railways.shx index 1cb4028..23d11ab 100644 Binary files a/map/brandenburg-latest.shp/railways.shx and b/map/brandenburg-latest.shp/railways.shx differ diff --git a/map/brandenburg-latest.shp/roads.dbf b/map/brandenburg-latest.shp/roads.dbf index e701dbb..b14b55f 100644 Binary files a/map/brandenburg-latest.shp/roads.dbf and b/map/brandenburg-latest.shp/roads.dbf differ diff --git a/map/brandenburg-latest.shp/roads.shp b/map/brandenburg-latest.shp/roads.shp index 9c55f06..fa413a8 100644 Binary files a/map/brandenburg-latest.shp/roads.shp and b/map/brandenburg-latest.shp/roads.shp differ diff --git a/map/brandenburg-latest.shp/roads.shx b/map/brandenburg-latest.shp/roads.shx index 172de52..4f0dcbe 100644 Binary files a/map/brandenburg-latest.shp/roads.shx and b/map/brandenburg-latest.shp/roads.shx differ diff --git a/map/brandenburg-latest.shp/source.txt b/map/brandenburg-latest.shp/source.txt new file mode 100644 index 0000000..0288376 --- /dev/null +++ b/map/brandenburg-latest.shp/source.txt @@ -0,0 +1 @@ +http://download.geofabrik.de/europe/germany/brandenburg-latest.shp.zip \ No newline at end of file diff --git a/map/brandenburg-latest.shp/waterways.dbf b/map/brandenburg-latest.shp/waterways.dbf index 2c669a3..6878a59 100644 Binary files a/map/brandenburg-latest.shp/waterways.dbf and b/map/brandenburg-latest.shp/waterways.dbf differ diff --git a/map/brandenburg-latest.shp/waterways.shp b/map/brandenburg-latest.shp/waterways.shp index 8e28cb6..2d0673e 100644 Binary files a/map/brandenburg-latest.shp/waterways.shp and b/map/brandenburg-latest.shp/waterways.shp differ diff --git a/map/brandenburg-latest.shp/waterways.shx b/map/brandenburg-latest.shp/waterways.shx index 4a91b93..94582de 100644 Binary files a/map/brandenburg-latest.shp/waterways.shx and b/map/brandenburg-latest.shp/waterways.shx differ diff --git a/map/btucscampus.qgs b/map/btucscampus.qgs index 1d869b8..8352902 100644 --- a/map/btucscampus.qgs +++ b/map/btucscampus.qgs @@ -4,10 +4,10 @@ degrees - 14.320259 - 51.765855 - 14.322504 - 51.766989 + 14.248768 + 51.731125 + 14.392448 + 51.803706 0 @@ -24,13 +24,13 @@ - -