Index: .classpath
===================================================================
--- .classpath	(revision 35609)
+++ .classpath	(working copy)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry excluding="crosby/binary/test/" kind="src" path="src"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="buildtest" path="test/unit">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -11,4 +10,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=pbf&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=ivy_settings.xml&amp;loadSettingsOnDemand=false&amp;ivyUserDir=&amp;propertyFiles="/>
 </classpath>
Index: .project
===================================================================
--- .project	(revision 35609)
+++ .project	(working copy)
@@ -26,5 +26,6 @@
 		<nature>org.sonar.ide.eclipse.core.sonarNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
 </projectDescription>
Index: ivy.xml
===================================================================
--- ivy.xml	(revision 35609)
+++ ivy.xml	(working copy)
@@ -1,6 +1,28 @@
 <ivy-module version="2.0">
-  <info organisation="org.openstreetmap.josm.plugins" module="pbf"/>
-  <dependencies>
-    <dependency conf="default->default" org="org.openstreetmap.pbf" name="osmpbf" rev="1.4.0"/>
-  </dependencies>
+	<info organisation="uk.org.mkgmap" module="mkgmap"/>
+
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
+		<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
+		<conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
+		<conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
+		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
+
+	</configurations>
+
+	<publications>
+		<artifact name="mkgmap" conf="master" />
+	</publications>
+	<dependencies>
+		<dependency org="com.google.protobuf" name="protobuf-java"
+			    rev="2.5.0"
+			    conf="compile->compile(*),master(*)" />
+
+		<dependency org="crosby" name="osmpbf"
+			    rev="1.3.3"
+			    conf="compile->compile(*),master(*)" />
+
+
+	</dependencies>
 </ivy-module>
Index: ivy_settings.xml
===================================================================
--- ivy_settings.xml	(revision 35609)
+++ ivy_settings.xml	(working copy)
@@ -1,7 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
 <ivysettings>
-  <settings defaultResolver="josm-nexus"/>
-  <resolvers>
-    <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
-  </resolvers>
+	<property name="mkgmap.ivy.repo" value="http://ivy.mkgmap.org.uk/repo" />
+	<settings defaultResolver="custom" />
+
+	<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+
+	<resolvers>
+		<chain name="custom" returnFirst="true">
+
+			<resolver ref="default" />
+
+			<url name="mkgmap">
+				<ivy pattern="${mkgmap.ivy.repo}/[organisation]/[module]/[revision]/ivys/ivy.xml" />
+				<artifact pattern="${mkgmap.ivy.repo}/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" />
+			</url>
+
+		</chain>
+
+
+	</resolvers>
+
 </ivysettings>
Index: src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java
===================================================================
--- src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java	(revision 35609)
+++ src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java	(working copy)
@@ -74,17 +74,15 @@
 
             if (header.hasBbox()) {
                 HeaderBBox bbox = header.getBbox();
-                if (bbox != null) {
-                    double minlat = parseRawDegrees(bbox.getBottom());
-                    double minlon = parseRawDegrees(bbox.getLeft());
-                    double maxlat = parseRawDegrees(bbox.getTop());
-                    double maxlon = parseRawDegrees(bbox.getRight());
-                    Bounds b = new Bounds(minlat, minlon, maxlat, maxlon);
-                    if (!b.isCollapsed() && areCoordinatesValid(minlat, minlon, maxlat, maxlon)) {
-                        ds.addDataSource(new DataSource(b, header.getSource()));
-                    } else {
-                        Logging.error("Invalid Bounds: "+b);
-                    }
+                double minlat = parseRawDegrees(bbox.getBottom());
+                double minlon = parseRawDegrees(bbox.getLeft());
+                double maxlat = parseRawDegrees(bbox.getTop());
+                double maxlon = parseRawDegrees(bbox.getRight());
+                Bounds b = new Bounds(minlat, minlon, maxlat, maxlon);
+                if (!b.isCollapsed() && areCoordinatesValid(minlat, minlon, maxlat, maxlon)) {
+                	ds.addDataSource(new DataSource(b, header.getSource()));
+                } else {
+                	Logging.error("Invalid Bounds: "+b);
                 }
             }
         }