Patch by Harshit Jain:
Marble now uses Geonames.org for city placemarks to fix several bugs in the placemark file.
CCBUG: 240622
CCBUG: 232450
M +10 -17 data/placemarks/COPYRIGHT
M +6 -6 data/placemarks/HOWTO-cities.txt
M data/placemarks/boundaryplacemarks.cache
M +21656 -22583 data/placemarks/cities.txt
M data/placemarks/cityplacemarks.cache
M +127527 -138237 data/placemarks/cityplacemarks.kml
A data/placemarks/statecodes.txt
M +32 -20 src/lib/FileLoader.cpp
M +0 -1 src/lib/MarbleDirs.cpp
M +34 -51 src/lib/PlacemarkInfoDialog.cpp
M +1 -1 src/lib/PlacemarkLayout.cpp
M +43 -40 src/lib/PlacemarkManager.cpp
M +2 -2 src/lib/geodata/data/GeoDataFeature.cpp
M +2 -3 src/lib/geodata/data/GeoDataFeature.h
M +2 -2 src/lib/geodata/data/GeoDataFeature_p.h
M +0 -3 src/lib/geodata/data/GeoDataPlacemark.cpp
U src/lib/geodata/data/GeoDataPlacemark_p.h
M +1 -1 src/lib/geodata/data/GeoDataStyleMap.cpp
M +1 -2 src/lib/geodata/handlers/kml/KmlRoleTagHandler.cpp
M +1 -1 src/lib/geodata/parser/GeoDataTypes.cpp
M +1 -1 src/lib/geodata/parser/GeoDataTypes.h
M +49 -12 tools/asc2kml/asc2kml.cpp
SVN commit 1135143 by bholst:
Patch by Harshit Jain:
Marble now uses Geonames.org for city placemarks to fix several bugs in the placemark file.
CCBUG: 240622
CCBUG: 232450
M +10 -17 data/placemarks /COPYRIGHT /HOWTO- cities. txt /boundaryplacem arks.cache /cities. txt /cityplacemarks .cache /cityplacemarks .kml /statecodes. txt FileLoader. cpp MarbleDirs. cpp PlacemarkInfoDi alog.cpp PlacemarkLayout .cpp PlacemarkManage r.cpp geodata/ data/GeoDataFea ture.cpp geodata/ data/GeoDataFea ture.h geodata/ data/GeoDataFea ture_p. h geodata/ data/GeoDataPla cemark. cpp geodata/ data/GeoDataPla cemark_ p.h geodata/ data/GeoDataSty leMap.cpp geodata/ handlers/ kml/KmlRoleTagH andler. cpp geodata/ parser/ GeoDataTypes. cpp geodata/ parser/ GeoDataTypes. h asc2kml. cpp
M +6 -6 data/placemarks
M data/placemarks
M +21656 -22583 data/placemarks
M data/placemarks
M +127527 -138237 data/placemarks
A data/placemarks
M +32 -20 src/lib/
M +0 -1 src/lib/
M +34 -51 src/lib/
M +1 -1 src/lib/
M +43 -40 src/lib/
M +2 -2 src/lib/
M +2 -3 src/lib/
M +2 -2 src/lib/
M +0 -3 src/lib/
U src/lib/
M +1 -1 src/lib/
M +1 -2 src/lib/
M +1 -1 src/lib/
M +1 -1 src/lib/
M +49 -12 tools/asc2kml/
WebSVN link: http:// websvn. kde.org/ ?view=rev& revision= 1135143