Update project

OsmAnd-java/src/net/osmand/binary/BinaryInspector.java

@@ -66,15 +66,16 @@ public class BinaryInspector {
 		// test cases show info
 		if(args.length == 1 && "test".equals(args[0])) {
 			in.inspector(new String[]{
-				"-vpoi",
+//				"-vpoi",
-//				"-vmap", "-vmapobjects",  //	"-vmapcoordinates", 
+				"-vmap", "-vmapobjects",  //	"-vmapcoordinates", 
 //				"-vrouting",
 //				"-vaddress", "-vcities","-vstreetgroups", 
 //				"-vstreets", "-vbuildings", "-vintersections", 
 //				"-zoom=15",
 //				"-bbox=1.74,51.17,1.75,51.16",
 //				"-vstats",
-				"/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
+				"/Users/victorshcherb/osmand/temp/Germany_bayern_europe_15_08_04.obf"
+//				"/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
 //				"/Users/victorshcherb/osmand/maps/Map.obf"
 //				"/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf"
 					});
@@ -813,7 +814,8 @@ public class BinaryInspector {
 								} catch (IOException e) {
 									throw new RuntimeException(e);
 								}
-							} else {
+							} else if(obj.getId() == 363826871l) {
+//							} else {
 								printMapDetails(obj, b, vInfo.vmapCoordinates);
 								println(b.toString());
 							}

OsmAnd/build.gradle

@@ -301,8 +301,8 @@ repositories {
 dependencies {
 	compile project(path: ":OsmAnd-java", configuration: "android")
 	compile project(":eclipse-compile:design")
-	compile project(":cardview")
+	compile project(":eclipse-compile:cardview")
-//	compile project(":recyclerview")
+//	compile project(":eclipse-compile:recyclerview")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],
@@ -312,12 +312,13 @@ dependencies {
 					"OsmAndCore_android.jar",
 					"OsmAndCore_wrapper.jar"])
 	// compile "com.github.ksoichiro:android-observablescrollview:1.5.0"
-//	 compile "com.android.support:appcompat-v7:22.2.1"
+	//	 compile "com.android.support:appcompat-v7:22.2.1"
 	// compile "com.github.shell-software:fab:1.0.5"
+	//	compile 'com.android.support:design:22.2.1'
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
 	qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 	qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-//	compile 'com.android.support:design:22.2.1'
+
 }

OsmAnd/project.properties

@@ -14,3 +14,4 @@ target=android-21
 dex.force.jumbo=true
 android.library.reference.1=../eclipse-compile/appcompat
 android.library.reference.2=../eclipse-compile/design
+android.library.reference.3=../eclipse-compile/cardview

eclipse-compile/cardview/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

eclipse-compile/cardview/.gitignore

@@ -0,0 +1,4 @@
+/bin
+/gen
+/R
+/classes

eclipse-compile/cardview/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android-cardview</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

eclipse-compile/cardview/AndroidManifest.xml

@@ -0,0 +1 @@
+src/main/AndroidManifest.xml

eclipse-compile/cardview/project.properties

@@ -0,0 +1,16 @@
+# 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 edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-21
+android.library=true
+android.library.reference.1=../appcompat

eclipse-compile/cardview/res

@@ -0,0 +1 @@
+src/main/res

eclipse-compile/design/.classpath

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/androidTest/java"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>

eclipse-compile/design/.gitignore

@@ -1,3 +1,4 @@
 /build
 /R
 /bin
+/gen

eclipse-compile/design/bin/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.support.design">
-    <uses-sdk android:minSdkVersion="7"/>
-    <application/>
-</manifest>

eclipse-compile/design/bin/jarlist.cache

@@ -1,3 +0,0 @@
-# cache for current jar dependency. DO NOT EDIT.
-# format is <lastModified> <length> <SHA-1> <path>
-# Encoding is UTF-8

eclipse-compile/design/gen/.gitignore

@@ -1 +0,0 @@
-/android/

eclipse-compile/design/gen/android/support/design/BuildConfig.java

@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package android.support.design;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}

settings.gradle

@@ -1,6 +1,8 @@
-include ':OsmAnd-java', ':eclipse-compile:design', ':cardview'
+include ':OsmAnd-java'
-include ':OsmAnd'
+include ':eclipse-compile:cardview'
+include ':eclipse-compile:design'
 include ':eclipse-compile:appcompat'
+include ':OsmAnd'
 include ':plugins:OsmAnd-AddressPlugin'
 include ':plugins:Osmand-ParkingPlugin'
 include ':plugins:Osmand-Sherpafy'