Index: src/uk/me/parabola/mkgmap/reader/osm/OsmMapDataSource.java
===================================================================
--- src/uk/me/parabola/mkgmap/reader/osm/OsmMapDataSource.java	(revision 3831)
+++ src/uk/me/parabola/mkgmap/reader/osm/OsmMapDataSource.java	(working copy)
@@ -69,6 +69,7 @@
 			new HighwayHooks(),
 			new LocationHook(),
 			new POIGeneratorHook(),
+			new ResidentialHook(),
 			new HousenumberHooks(),
 	};
 	protected OsmConverter converter;
Index: src/uk/me/parabola/mkgmap/reader/osm/ResidentialHook.java
===================================================================
--- src/uk/me/parabola/mkgmap/reader/osm/ResidentialHook.java	(nonexistent)
+++ src/uk/me/parabola/mkgmap/reader/osm/ResidentialHook.java	(working copy)
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2017.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 or
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+package uk.me.parabola.mkgmap.reader.osm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.unimi.dsi.fastutil.shorts.ShortArrayList;
+import uk.me.parabola.imgfmt.app.Coord;
+import uk.me.parabola.log.Logger;
+import uk.me.parabola.mkgmap.build.LocatorUtil;
+import uk.me.parabola.mkgmap.reader.osm.boundary.Boundary;
+import uk.me.parabola.mkgmap.reader.osm.boundary.BoundaryQuadTree;
+import uk.me.parabola.util.EnhancedProperties;
+import uk.me.parabola.util.Java2DConverter;
+
+/**
+ * Hook to add tag mkgmap:residential to elements that lie within a landuse=residential area.
+ * @author Gerd Petermann
+ *
+ */
+public class ResidentialHook extends OsmReadingHooksAdaptor {
+	private static final Logger log = Logger.getLogger(ResidentialHook.class);
+
+	
+	private BoundaryQuadTree residentialBoundaries;
+	
+	private ElementSaver saver;
+	private EnhancedProperties props;
+
+	public boolean init(ElementSaver saver, EnhancedProperties props) {
+		this.props = props;
+		this.saver = saver;
+		if (props.getProperty("residential-hook", true) == false)
+			return false; 
+		return true;
+	}
+
+	public void end() {
+		log.info("Starting with residential hook");
+
+		long t1 = System.currentTimeMillis();
+		residentialBoundaries = buildResidentialBoundaryTree();
+		long t2 = System.currentTimeMillis();
+		log.info("Creating residential bounds took", (t2 - t1), "ms");
+		
+		// process all nodes that might be converted to a garmin node (tagcount > 0)
+		for (Node node : saver.getNodes().values()) {
+			if (node.getTagCount() > 0) {
+				if (saver.getBoundingBox().contains(node.getLocation())){
+					processElem(node);
+				}
+			}
+		}
+
+		// process  all ways that might be converted to a garmin way (tagcount > 0)
+		for (Way way : saver.getWays().values()) {
+			if (way.getTagCount() > 0) {
+				processElem(way);
+			}
+		}
+		// free memory
+		residentialBoundaries = null;
+	}
+
+	private static final short landuseTagKey = TagDict.getInstance().xlate("landuse"); 
+	private static final short nameTagKey = TagDict.getInstance().xlate("name");  
+	private static final short styleFilterTagKey = TagDict.getInstance().xlate("mkgmap:stylefilter");
+	private static final short fakeResidentialKey = TagDict.getInstance().xlate("mkgmap:admin_level11");
+	
+	private BoundaryQuadTree buildResidentialBoundaryTree() {
+		List<String> nameTags = LocatorUtil.getNameTags(props);
+		ShortArrayList nameTagList;
+		if (nameTags != null){
+			nameTagList = new ShortArrayList();
+			for(String n : nameTags)
+				nameTagList.add(TagDict.getInstance().xlate(n));
+		} else 
+			nameTagList = null;
+		
+		
+		List<Boundary> residentials = new ArrayList<>();
+		Tags tags = new Tags();
+		tags.put("admin_level", "11");
+		
+		for (Way way : saver.getWays().values()) {
+			if (way.hasIdenticalEndPoints() && "residential".equals(way.getTag(landuseTagKey))) {
+				if ("polyline".equals(way.getTag(styleFilterTagKey)))
+					continue;
+				String name = getNameTag(nameTagList, way);
+				tags.put(nameTagKey, name == null ? "yes": name);
+				Boundary b = new Boundary(Java2DConverter.createArea(way.getPoints()), tags, "w"+way.getId());
+				residentials.add(b);
+			}
+		}
+		
+		return new BoundaryQuadTree(saver.getBoundingBox(), residentials, props);
+	}
+
+	/**
+	 * Extract the location info and perform a test 
+	 * against the BoundaryQuadTree. If found, assign the tag.
+	 * @param elem A way or Node
+	 */
+	private void processElem(Element elem){
+		Tags residentialTags = null;
+
+		if (elem instanceof Node){
+			Node node = (Node) elem;
+			residentialTags = residentialBoundaries.get(node.getLocation());
+		} else if (elem instanceof Way){
+			Way way = (Way) elem;
+			// try the mid point of the way first
+			int middle = way.getPoints().size() / 2;
+			Coord loc = way.hasIdenticalEndPoints() ? way.getCofG() : way.getPoints().get(middle);
+			if (! "residential".equals(way.getTag(landuseTagKey)))
+				residentialTags = residentialBoundaries.get(loc);
+		}
+
+		if (residentialTags != null) {
+			elem.addTag("mkgmap:residential", residentialTags.get(fakeResidentialKey));
+		}
+	}
+	
+	/**
+	 * Set name tag according to name-tag-list.
+	 * @param nameTagList
+	 * @param el
+	 * @return 
+	 */
+	private String getNameTag(ShortArrayList nameTagList, Element el) {
+		if (nameTagList == null)
+			return el.getTag(nameTagKey);
+
+		for (short tagKey : nameTagList) {
+			String val = el.getTag(tagKey);
+			if (val != null) {
+				return val;
+			}
+		}
+		return null;
+	}
+
+}
+
+