Skip to content
Permalink
Browse files

Normalize line endings

  • Loading branch information
neilboyd committed Mar 6, 2014
1 parent 228887a commit eed833ae4b6bb00e000002141c9bb531804233b9
Showing with 21,419 additions and 21,406 deletions.
  1. +13 −0 .gitattributes
  2. +57 −57 OpenStreetMapViewer/ext/php/gpxuploader/upload.php
  3. +65 −65 OpenStreetMapViewer/pom.xml
  4. +12 −12 OpenStreetMapViewer/project.properties
  5. +14 −14 OpenStreetMapViewer/res/layout/main.xml
  6. +13 −13 OpenStreetMapViewer/res/layout/mapview.xml
  7. +65 −65 OpenStreetMapViewer/src/org/osmdroid/MapActivity.java
  8. +239 −239 OpenStreetMapViewer/src/org/osmdroid/MapFragment.java
  9. +61 −61 OpenStreetMapViewer/src/org/osmdroid/ResourceProxyImpl.java
  10. +39 −39 OpenStreetMapViewer/src/org/osmdroid/RotationGestureDetector.java
  11. +107 −107 OpenStreetMapViewer/src/org/osmdroid/RotationGestureOverlay.java
  12. +99 −99 OpenStreetMapViewer/src/org/osmdroid/SampleItemizedOverlay.java
  13. +22 −22 OpenStreetMapViewer/src/org/osmdroid/SampleOverlayItem.java
  14. +33 −33 OpenStreetMapViewer/src/org/osmdroid/constants/OpenStreetMapConstants.java
  15. +62 −62 OpenStreetMapViewer/src/org/osmdroid/samplefragments/BaseSampleFragment.java
  16. +28 −28 OpenStreetMapViewer/src/org/osmdroid/samplefragments/SampleFactory.java
  17. +63 −63 OpenStreetMapViewer/src/org/osmdroid/samplefragments/SampleFragmentXmlLayout.java
  18. +146 −146 OpenStreetMapViewer/src/org/osmdroid/samplefragments/SampleLimitedScrollArea.java
  19. +155 −155 OpenStreetMapViewer/src/org/osmdroid/samplefragments/SampleWithMinimapItemizedoverlayWithFocus.java
  20. +83 −83 OpenStreetMapViewer/src/org/osmdroid/samples/SampleLoader.java
  21. +185 −185 OpenStreetMapViewer/src/org/osmdroid/samples/SampleMapActivity.java
  22. +145 −145 OpenStreetMapViewer/src/org/osmdroid/samples/SampleWithMinimapItemizedoverlay.java
  23. +115 −115 OpenStreetMapViewer/src/org/osmdroid/samples/SampleWithMinimapZoomcontrols.java
  24. +80 −80 OpenStreetMapViewer/src/org/osmdroid/samples/SampleWithTilesOverlay.java
  25. +81 −81 OpenStreetMapViewer/src/org/osmdroid/samples/SampleWithTilesOverlayAndCustomTileSource.java
  26. +45 −45 OpenStreetMapViewer/src/org/osmdroid/views/util/MapTileProviderFactory.java
  27. +15 −15 osmdroid-android-it/AndroidManifest.xml
  28. +2 −2 osmdroid-android-it/default.properties
  29. +79 −79 osmdroid-android-it/pom.xml
  30. +12 −12 osmdroid-android-it/res/layout/main.xml
  31. +5 −5 osmdroid-android-it/res/values/strings.xml
  32. +48 −48 osmdroid-android-it/src/main/java/org/osmdroid/ContextResourceProxyTest.java
  33. +18 −18 osmdroid-android-it/src/main/java/org/osmdroid/test/MapActivityTest.java
  34. +36 −36 osmdroid-android/.classpath
  35. +23 −23 osmdroid-android/.project
  36. +48 −48 osmdroid-android/pom.xml
  37. +265 −265 osmdroid-android/src/main/java/microsoft/mappoint/TileSystem.java
  38. +175 −175 osmdroid-android/src/main/java/org/osmdroid/DefaultResourceProxyImpl.java
  39. +63 −63 osmdroid-android/src/main/java/org/osmdroid/LocationListenerProxy.java
  40. +63 −63 osmdroid-android/src/main/java/org/osmdroid/ResourceProxy.java
  41. +44 −44 osmdroid-android/src/main/java/org/osmdroid/SensorEventListenerProxy.java
  42. +11 −11 osmdroid-android/src/main/java/org/osmdroid/api/IGeoPoint.java
  43. +107 −107 osmdroid-android/src/main/java/org/osmdroid/api/IMap.java
  44. +24 −24 osmdroid-android/src/main/java/org/osmdroid/api/IMapController.java
  45. +26 −26 osmdroid-android/src/main/java/org/osmdroid/api/IMapView.java
  46. +33 −33 osmdroid-android/src/main/java/org/osmdroid/api/IMyLocationOverlay.java
  47. +37 −37 osmdroid-android/src/main/java/org/osmdroid/api/IPosition.java
  48. +56 −56 osmdroid-android/src/main/java/org/osmdroid/api/IProjection.java
  49. +90 −90 osmdroid-android/src/main/java/org/osmdroid/api/Marker.java
  50. +10 −10 osmdroid-android/src/main/java/org/osmdroid/api/OnCameraChangeListener.java
  51. +64 −64 osmdroid-android/src/main/java/org/osmdroid/api/Polyline.java
  52. +82 −82 osmdroid-android/src/main/java/org/osmdroid/contributor/GpxToPHPUploader.java
  53. +275 −275 osmdroid-android/src/main/java/org/osmdroid/contributor/OSMUploader.java
  54. +61 −61 osmdroid-android/src/main/java/org/osmdroid/contributor/RouteRecorder.java
  55. +73 −73 osmdroid-android/src/main/java/org/osmdroid/contributor/util/RecordedGeoPoint.java
  56. +131 −131 osmdroid-android/src/main/java/org/osmdroid/contributor/util/RecordedRouteGPXFormatter.java
  57. +78 −78 osmdroid-android/src/main/java/org/osmdroid/contributor/util/Util.java
  58. +30 −30 ...roid/src/main/java/org/osmdroid/contributor/util/constants/OpenStreetMapContributorConstants.java
  59. +100 −100 osmdroid-android/src/main/java/org/osmdroid/events/DelayedMapListener.java
  60. +21 −21 osmdroid-android/src/main/java/org/osmdroid/events/MapAdapter.java
  61. +10 −10 osmdroid-android/src/main/java/org/osmdroid/events/MapEvent.java
  62. +20 −20 osmdroid-android/src/main/java/org/osmdroid/events/MapListener.java
  63. +46 −46 osmdroid-android/src/main/java/org/osmdroid/events/ScrollEvent.java
  64. +37 −37 osmdroid-android/src/main/java/org/osmdroid/events/ZoomEvent.java
  65. +42 −42 osmdroid-android/src/main/java/org/osmdroid/http/HttpClientFactory.java
  66. +16 −16 osmdroid-android/src/main/java/org/osmdroid/http/IHttpClientFactory.java
  67. +80 −80 osmdroid-android/src/main/java/org/osmdroid/tileprovider/BitmapPool.java
  68. +50 −50 osmdroid-android/src/main/java/org/osmdroid/tileprovider/ExpirableBitmapDrawable.java
  69. +88 −88 osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileCache.java
  70. +236 −236 osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileProviderArray.java
  71. +427 −427 osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileProviderBase.java
  72. +63 −63 osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileProviderBasic.java
  73. +45 −45 osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileRequestState.java
  74. +53 −53 osmdroid-android/src/main/java/org/osmdroid/tileprovider/ReusableBitmapDrawable.java
  75. +72 −72 ...android/src/main/java/org/osmdroid/tileprovider/constants/OpenStreetMapTileProviderConstants.java
  76. +56 −56 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/ArchiveFileFactory.java
  77. +30 −30 ...id-android/src/main/java/org/osmdroid/tileprovider/modules/ConfigurablePriorityThreadFactory.java
  78. +65 −65 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/DatabaseFileArchive.java
  79. +13 −13 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/GEMFFileArchive.java
  80. +21 −21 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/IArchiveFile.java
  81. +29 −29 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/IFilesystemCache.java
  82. +12 −12 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/INetworkAvailablityCheck.java
  83. +79 −79 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MBTilesFileArchive.java
  84. +251 −251 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileDownloader.java
  85. +235 −235 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileFileArchiveProvider.java
  86. +86 −86 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileFileStorageProviderBase.java
  87. +178 −178 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileFilesystemProvider.java
  88. +325 −325 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileModuleProviderBase.java
  89. +50 −50 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/NetworkAvailabliltyCheck.java
  90. +243 −243 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/TileWriter.java
  91. +55 −55 osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/ZipFileArchive.java
  92. +167 −167 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/BitmapTileSourceBase.java
  93. +60 −60 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/CloudmadeTileSource.java
  94. +15 −15 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/IStyledTileSource.java
  95. +85 −85 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/ITileSource.java
  96. +99 −99 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/MapBoxTileSource.java
  97. +36 −36 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/OnlineTileSourceBase.java
  98. +42 −42 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/QuadTreeTileSource.java
  99. +149 −149 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/TileSourceFactory.java
  100. +23 −23 osmdroid-android/src/main/java/org/osmdroid/tileprovider/tilesource/XYTileSource.java
  101. +142 −142 osmdroid-android/src/main/java/org/osmdroid/tileprovider/util/CloudmadeUtil.java
  102. +44 −44 osmdroid-android/src/main/java/org/osmdroid/tileprovider/util/ManifestUtil.java
  103. +25 −25 osmdroid-android/src/main/java/org/osmdroid/tileprovider/util/SimpleInvalidationHandler.java
  104. +28 −28 osmdroid-android/src/main/java/org/osmdroid/tileprovider/util/SimpleRegisterReceiver.java
  105. +91 −91 osmdroid-android/src/main/java/org/osmdroid/tileprovider/util/StreamUtils.java
  106. +270 −270 osmdroid-android/src/main/java/org/osmdroid/util/BoundingBoxE6.java
  107. +330 −330 osmdroid-android/src/main/java/org/osmdroid/util/GeoPoint.java
  108. +63 −63 osmdroid-android/src/main/java/org/osmdroid/util/GeometryMath.java
  109. +52 −52 osmdroid-android/src/main/java/org/osmdroid/util/LocationUtils.java
  110. +63 −63 osmdroid-android/src/main/java/org/osmdroid/util/MyMath.java
  111. +57 −57 osmdroid-android/src/main/java/org/osmdroid/util/Position.java
  112. +62 −62 osmdroid-android/src/main/java/org/osmdroid/util/ResourceProxyImpl.java
  113. +46 −46 osmdroid-android/src/main/java/org/osmdroid/util/TileLooper.java
  114. +115 −115 osmdroid-android/src/main/java/org/osmdroid/util/TileSystem.java
  115. +18 −18 osmdroid-android/src/main/java/org/osmdroid/util/constants/GeoConstants.java
  116. +10 −10 osmdroid-android/src/main/java/org/osmdroid/util/constants/UtilConstants.java
  117. +1,742 −1,742 osmdroid-android/src/main/java/org/osmdroid/views/MapView.java
  118. +159 −159 osmdroid-android/src/main/java/org/osmdroid/views/overlay/DirectedLocationOverlay.java
  119. +26 −26 osmdroid-android/src/main/java/org/osmdroid/views/overlay/IOverlayMenuProvider.java
  120. +217 −217 osmdroid-android/src/main/java/org/osmdroid/views/overlay/ItemizedIconOverlay.java
  121. +350 −350 osmdroid-android/src/main/java/org/osmdroid/views/overlay/ItemizedOverlay.java
  122. +148 −148 osmdroid-android/src/main/java/org/osmdroid/views/overlay/ItemizedOverlayControlView.java
  123. +277 −277 osmdroid-android/src/main/java/org/osmdroid/views/overlay/ItemizedOverlayWithFocus.java
  124. +310 −310 osmdroid-android/src/main/java/org/osmdroid/views/overlay/MinimapOverlay.java
  125. +881 −881 osmdroid-android/src/main/java/org/osmdroid/views/overlay/MyLocationOverlay.java
  126. +371 −371 osmdroid-android/src/main/java/org/osmdroid/views/overlay/Overlay.java
  127. +167 −167 osmdroid-android/src/main/java/org/osmdroid/views/overlay/OverlayItem.java
  128. +366 −366 osmdroid-android/src/main/java/org/osmdroid/views/overlay/OverlayManager.java
  129. +261 −261 osmdroid-android/src/main/java/org/osmdroid/views/overlay/PathOverlay.java
  130. +89 −89 osmdroid-android/src/main/java/org/osmdroid/views/overlay/SafeDrawOverlay.java
  131. +87 −87 osmdroid-android/src/main/java/org/osmdroid/views/overlay/SimpleLocationOverlay.java
  132. +377 −377 osmdroid-android/src/main/java/org/osmdroid/views/overlay/TilesOverlay.java
  133. +467 −467 osmdroid-android/src/main/java/org/osmdroid/views/overlay/compass/CompassOverlay.java
  134. +7 −7 osmdroid-android/src/main/java/org/osmdroid/views/overlay/compass/IOrientationConsumer.java
  135. +11 −11 osmdroid-android/src/main/java/org/osmdroid/views/overlay/compass/IOrientationProvider.java
  136. +73 −73 ...-android/src/main/java/org/osmdroid/views/overlay/compass/InternalCompassOrientationProvider.java
  137. +120 −120 osmdroid-android/src/main/java/org/osmdroid/views/overlay/mylocation/GpsMyLocationProvider.java
  138. +7 −7 osmdroid-android/src/main/java/org/osmdroid/views/overlay/mylocation/IMyLocationConsumer.java
  139. +11 −11 osmdroid-android/src/main/java/org/osmdroid/views/overlay/mylocation/IMyLocationProvider.java
  140. +549 −549 osmdroid-android/src/main/java/org/osmdroid/views/overlay/mylocation/MyLocationNewOverlay.java
  141. +1,078 −1,078 osmdroid-android/src/main/java/org/osmdroid/views/safecanvas/ISafeCanvas.java
  142. +42 −42 osmdroid-android/src/main/java/org/osmdroid/views/safecanvas/SafeBitmapShader.java
  143. +43 −43 osmdroid-android/src/main/java/org/osmdroid/views/safecanvas/SafeDashPathEffect.java
  144. +25 −25 osmdroid-android/src/main/java/org/osmdroid/views/safecanvas/SafePaint.java
  145. +600 −600 osmdroid-android/src/main/java/org/osmdroid/views/safecanvas/SafeTranslatedCanvas.java
  146. +466 −466 osmdroid-android/src/main/java/org/osmdroid/views/safecanvas/SafeTranslatedPath.java
  147. +159 −159 osmdroid-android/src/main/java/org/osmdroid/views/util/Mercator.java
  148. +73 −73 osmdroid-android/src/main/java/org/osmdroid/views/util/MyMath.java
  149. +96 −96 osmdroid-android/src/main/java/org/osmdroid/views/util/PathProjection.java
  150. +36 −36 osmdroid-android/src/main/java/org/osmdroid/views/util/constants/MapViewConstants.java
  151. +24 −24 osmdroid-android/src/main/java/org/osmdroid/views/util/constants/MathConstants.java
  152. +16 −16 osmdroid-android/src/main/java/org/osmdroid/views/util/constants/OverlayConstants.java
  153. +32 −32 osmdroid-android/src/test/java/org/osmdroid/DefaultResourceProxyTest.java
  154. +124 −124 osmdroid-android/src/test/java/org/osmdroid/util/GeoPointTest.java
  155. +36 −36 osmdroid-third-party/.classpath
  156. +23 −23 osmdroid-third-party/.project
  157. +73 −73 osmdroid-third-party/pom.xml
  158. +46 −46 osmdroid-third-party/src/main/java/org/osmdroid/google/overlay/GoogleItemizedOverlay.java
  159. +112 −112 osmdroid-third-party/src/main/java/org/osmdroid/google/overlay/GooglePolylineOverlay.java
  160. +55 −55 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/GeoPoint.java
  161. +77 −77 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/MapController.java
  162. +80 −80 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/MapView.java
  163. +24 −24 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/MyLocationOverlay.java
  164. +55 −55 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/Projection.java
  165. +48 −48 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/v2/GeoPoint.java
  166. +206 −206 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/v2/GoogleV1MapWrapper.java
  167. +100 −100 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/v2/MapFactory.java
  168. +200 −200 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/v2/MapWrapper.java
  169. +232 −232 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/v2/OsmdroidMapWrapper.java
  170. +55 −55 osmdroid-third-party/src/main/java/org/osmdroid/google/wrapper/v2/Projection.java
  171. +265 −265 osmdroid-third-party/src/main/java/org/osmdroid/tileprovider/tilesource/bing/BingMapTileSource.java
  172. +59 −59 ...arty/src/main/java/org/osmdroid/tileprovider/tilesource/bing/imagerymetadata/ImageryMetaData.java
  173. +112 −112 .../main/java/org/osmdroid/tileprovider/tilesource/bing/imagerymetadata/ImageryMetaDataResource.java
  174. +337 −337 pom.xml
@@ -0,0 +1,13 @@
* text=auto

*.java text
*.txt text
*.xml text
*.gradle text
*.php text
*.properties text
.classpath text
.project text

*.png binary
*.jpg binary
@@ -1,58 +1,58 @@
<?php
function endsWith( $str, $sub ) {
return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub );
}

$ERRCODE_NONE = 0;
$ERRCODE_FILESIZE_EXCEEDED = 1;
$ERRCODE_FILEENDING_BAD = 2;
$ERRCODE_FILETYPE_DISALLOWED = 3;
$ERRCODE_UPLOAD_ERROR = 4;

$target = "data/";
$filename = basename( $_FILES['gpxfile']['name']);
$target = $target . $filename;
$errorCode = $ERRCODE_NONE;

$xmlHead = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
$baseErrorTag = "<error errorCode=\"%d\" message=\"%s\"/>";
$baseSuccessTag = "<success message=\"%s\"/>";
$errorTag = "";
$successTag = "";

$uploaded_size = $_FILES['gpxfile']['size'];

$maxFilesize = 500000; // In Bytes

//This is our size condition
if ($errorCode == $ERRCODE_NONE && $uploaded_size > $maxFilesize) {
$errorCode = $ERRCODE_FILESIZE_EXCEEDED;
$errorTag = sprintf($baseErrorTag, $errorCode, "Filezise exceeded. File: '" . $uploaded_size . "' Max: '" . $maxFilesize . "'");
}

if ($errorCode == $ERRCODE_NONE && !endsWith($filename, ".gpx")) {
$errorCode = $ERRCODE_FILEENDING_BAD;
$errorTag = sprintf($baseErrorTag, $errorCode, "Bad file-ending.");
}

//This is our limit file type condition
if ($errorCode == $ERRCODE_NONE && $uploaded_type == "text/php") {
$errorCode = $ERRCODE_FILETYPE_DISALLOWED;
$errorTag = sprintf($baseErrorTag, $errorCode, "Disallowed Filetype");
}

if ($errorCode == $ERRCODE_NONE) { //If everything is ok we try to upload it
if(move_uploaded_file($_FILES['gpxfile']['tmp_name'], $target)) {
$successTag = sprintf($baseSuccessTag, "The file '". $filename . "' has been uploaded");
} else {
$errorCode = $ERRCODE_UPLOAD_ERROR;
$errorTag = sprintf($baseErrorTag, $errorCode, "File '" . $filename . "' could not be uploaded.");
}
}

if($errorCode == $ERRCODE_NONE){
echo $xmlHead . $successTag;
} else {
echo $xmlHead . $errorTag;
}
<?php
function endsWith( $str, $sub ) {
return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub );
}

$ERRCODE_NONE = 0;
$ERRCODE_FILESIZE_EXCEEDED = 1;
$ERRCODE_FILEENDING_BAD = 2;
$ERRCODE_FILETYPE_DISALLOWED = 3;
$ERRCODE_UPLOAD_ERROR = 4;

$target = "data/";
$filename = basename( $_FILES['gpxfile']['name']);
$target = $target . $filename;
$errorCode = $ERRCODE_NONE;

$xmlHead = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
$baseErrorTag = "<error errorCode=\"%d\" message=\"%s\"/>";
$baseSuccessTag = "<success message=\"%s\"/>";
$errorTag = "";
$successTag = "";

$uploaded_size = $_FILES['gpxfile']['size'];

$maxFilesize = 500000; // In Bytes

//This is our size condition
if ($errorCode == $ERRCODE_NONE && $uploaded_size > $maxFilesize) {
$errorCode = $ERRCODE_FILESIZE_EXCEEDED;
$errorTag = sprintf($baseErrorTag, $errorCode, "Filezise exceeded. File: '" . $uploaded_size . "' Max: '" . $maxFilesize . "'");
}

if ($errorCode == $ERRCODE_NONE && !endsWith($filename, ".gpx")) {
$errorCode = $ERRCODE_FILEENDING_BAD;
$errorTag = sprintf($baseErrorTag, $errorCode, "Bad file-ending.");
}

//This is our limit file type condition
if ($errorCode == $ERRCODE_NONE && $uploaded_type == "text/php") {
$errorCode = $ERRCODE_FILETYPE_DISALLOWED;
$errorTag = sprintf($baseErrorTag, $errorCode, "Disallowed Filetype");
}

if ($errorCode == $ERRCODE_NONE) { //If everything is ok we try to upload it
if(move_uploaded_file($_FILES['gpxfile']['tmp_name'], $target)) {
$successTag = sprintf($baseSuccessTag, "The file '". $filename . "' has been uploaded");
} else {
$errorCode = $ERRCODE_UPLOAD_ERROR;
$errorTag = sprintf($baseErrorTag, $errorCode, "File '" . $filename . "' could not be uploaded.");
}
}

if($errorCode == $ERRCODE_NONE){
echo $xmlHead . $successTag;
} else {
echo $xmlHead . $errorTag;
}
?>
@@ -1,65 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.osmdroid</groupId>
<artifactId>osmdroid-parent</artifactId>
<version>4.2-SNAPSHOT</version>
</parent>

<artifactId>OpenStreetMapViewer</artifactId>
<packaging>apk</packaging>

<name>OpenStreetMap viewer</name>

<dependencies>
<!-- Android included libraries -->
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android-test</artifactId>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>osmdroid-android</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>osmdroid-third-party</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-android</artifactId>
</dependency>
</dependencies>

<build>
<sourceDirectory>${basedir}/src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.osmdroid</groupId>
<artifactId>osmdroid-parent</artifactId>
<version>4.2-SNAPSHOT</version>
</parent>

<artifactId>OpenStreetMapViewer</artifactId>
<packaging>apk</packaging>

<name>OpenStreetMap viewer</name>

<dependencies>
<!-- Android included libraries -->
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android-test</artifactId>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>osmdroid-android</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>osmdroid-third-party</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-android</artifactId>
</dependency>
</dependencies>

<build>
<sourceDirectory>${basedir}/src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
@@ -1,12 +1,12 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "ant.properties", and override values to adapt the script to your
# project structure.

# Project target.
target=android-16
apk-configurations=
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "ant.properties", and override values to adapt the script to your
# project structure.

# Project target.
target=android-16
apk-configurations=
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/parent_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<FrameLayout
android:id="@+id/map_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
>

</FrameLayout>

<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/parent_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<FrameLayout
android:id="@+id/map_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
>

</FrameLayout>

</RelativeLayout>
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/parent_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<org.osmdroid.views.MapView
android:id="@+id/mapview"
android:layout_width="match_parent"
android:layout_height="match_parent"
tilesource="Mapnik"
/>

<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/parent_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<org.osmdroid.views.MapView
android:id="@+id/mapview"
android:layout_width="match_parent"
android:layout_height="match_parent"
tilesource="Mapnik"
/>

</RelativeLayout>

0 comments on commit eed833a

Please sign in to comment.
You can’t perform that action at this time.