diff --git a/geoapi/insert/loadcvs.php b/geoapi/insert/loadcvs.php index 3ebf8f2..d8c6fea 100644 --- a/geoapi/insert/loadcvs.php +++ b/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 = ""; diff --git a/map/brandenburg-latest.shp/README b/map/brandenburg-latest.shp/README index 38ca252..bca6def 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-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 diff --git a/map/brandenburg-latest.shp/buildings.dbf b/map/brandenburg-latest.shp/buildings.dbf index 567e29d..0c1e001 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 9a4edc7..a3c7eab 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 c8e65fe..fbf1330 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 9a23a94..26e6fa4 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 5baf48e..55e2a73 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 e6e3d3b..f204b96 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 b5e432c..be4fd64 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 1fd07f0..8cdc278 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 2a5cbdb..da8d8bc 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 f2033e3..a4df0dd 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 dc83af1..21de196 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 e717766..d119fde 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 7ef6595..2eda064 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 97be3ef..6338168 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 adcdf9f..8af7bc5 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 0b7ae77..e3bb2fd 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 02e21bb..caab044 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 b9d7c58..1cb4028 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 3e88f43..e701dbb 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 1c31044..9c55f06 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 5268723..172de52 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/waterways.dbf b/map/brandenburg-latest.shp/waterways.dbf index a594ef9..2c669a3 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 79cc484..8e28cb6 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 3cf8204..4a91b93 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 faecdfa..1d869b8 100644 --- a/map/btucscampus.qgs +++ b/map/btucscampus.qgs @@ -4,10 +4,10 @@ degrees - 14.191382 - 51.659713 - 14.478726 - 51.804868 + 14.320259 + 51.765855 + 14.322504 + 51.766989 0 @@ -24,57 +24,57 @@ - + - + - + - + - + - + - - - buildings20130724135323515 + buildings20130814151114116 ./brandenburg-latest.shp/buildings.shp @@ -106,7 +106,7 @@ - + @@ -119,7 +119,7 @@ - + name - + . - + . @@ -795,7 +795,7 @@ - + name - + . - + . diff --git a/map/campus-cottbus-mitte-gebäude.csv b/map/campus-cottbus-mitte-gebäude.csv index 87fab5c..cece955 100644 --- a/map/campus-cottbus-mitte-gebäude.csv +++ b/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ä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ä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ä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 diff --git a/map/campus-cottbus-mitte-gebäude.dbf b/map/campus-cottbus-mitte-gebäude.dbf index 706e223..e476a91 100644 Binary files a/map/campus-cottbus-mitte-gebäude.dbf and b/map/campus-cottbus-mitte-gebäude.dbf differ diff --git a/map/campus-cottbus-mitte-gebäude.prj b/map/campus-cottbus-mitte-gebäude.prj deleted file mode 100644 index a30c00a..0000000 --- a/map/campus-cottbus-mitte-gebäude.prj +++ /dev/null @@ -1 +0,0 @@ -GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file diff --git a/map/campus-cottbus-mitte-gebäude.qpj b/map/campus-cottbus-mitte-gebäude.qpj deleted file mode 100644 index 5fbc831..0000000 --- a/map/campus-cottbus-mitte-gebäude.qpj +++ /dev/null @@ -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"]] diff --git a/map/campus-cottbus-mitte-gebäude.shp b/map/campus-cottbus-mitte-gebäude.shp index 068ae01..ec0ec02 100644 Binary files a/map/campus-cottbus-mitte-gebäude.shp and b/map/campus-cottbus-mitte-gebäude.shp differ diff --git a/map/campus-cottbus-mitte-gebäude.shx b/map/campus-cottbus-mitte-gebäude.shx index fead838..9e23956 100644 Binary files a/map/campus-cottbus-mitte-gebäude.shx and b/map/campus-cottbus-mitte-gebäude.shx differ