roadmap-commit Mailing List for RoadMap (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2804
          http://sourceforge.net/p/roadmap/code/2804
Author:   pgf
Date:     2015-05-31 23:07:43 +0000 (Sun, 31 May 2015)
Log Message:
-----------
places basically working.  finally.

only tested on one quadtile.

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_place.c
    trunk/roadmap/src/roadmap_label.c
    trunk/roadmap/src/roadmap_label.h
    trunk/roadmap/src/roadmap_layer.c
    trunk/roadmap/src/roadmap_layer.h
    trunk/roadmap/src/roadmap_locator.c
    trunk/roadmap/src/roadmap_place.c
    trunk/roadmap/src/roadmap_place.h
    trunk/roadmap/src/roadmap_plugin.c
    trunk/roadmap/src/roadmap_plugin.h
    trunk/roadmap/src/roadmap_screen.c

Modified: trunk/roadmap/src/buildmap_place.c
===================================================================

--- trunk/roadmap/src/buildmap_place.c	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/buildmap_place.c	2015-05-31 23:07:43 UTC (rev 2804)
@@ -383,11 +383,13 @@
 
    int *db_places;
    int *db_layer;
+   RoadMapString *db_name;
    RoadMapPlaceBySquare *db_square;
 
    buildmap_db *root;
    buildmap_db *data_table;
    buildmap_db *square_table;
+   buildmap_db *name_table;
    buildmap_db *layer_table;
 
 
@@ -422,6 +424,8 @@
          }
          square_current = square;
 
+
+
          layer_current = 0; /* Restart from first layer. */
       }
 
@@ -454,13 +458,19 @@
    }
    buildmap_db_add_data (data_table, PlaceCount, sizeof(int));
 
+   name_table = buildmap_db_add_section (root, "name");
+   if (name_table == NULL) {
+      buildmap_error (0, "Can't add a new section");
+      return 1;
+   }
+   buildmap_db_add_data (name_table, PlaceCount, sizeof(RoadMapString));
+
    square_table = buildmap_db_add_section (root, "bysquare");
    if (square_table == NULL) {
       buildmap_error (0, "Can't add a new section");
       return 1;
    }
-   buildmap_db_add_data (square_table,
-                         square_count, sizeof(RoadMapPlaceBySquare));
+   buildmap_db_add_data (square_table, square_count, sizeof(RoadMapPlaceBySquare));
 
    layer_table = buildmap_db_add_section (root, "bylayer");
    if (layer_table == NULL) {
@@ -470,6 +480,7 @@
    buildmap_db_add_data (layer_table, layer_count, sizeof(int));
 
    db_places  = (int *) buildmap_db_get_data (data_table);
+   db_name  = (RoadMapString *) buildmap_db_get_data (name_table);
    db_layer   = (int *) buildmap_db_get_data (layer_table);
    db_square  = (RoadMapPlaceBySquare *) buildmap_db_get_data (square_table);
 
@@ -485,8 +496,9 @@
       one_place = Place[j/BUILDMAP_BLOCK] + (j % BUILDMAP_BLOCK);
 
       db_places[i] = one_place->point;
+      db_name[i] = one_place->name;
+
       square = one_place->square;
-
       if (square != square_current) {
 
          if (square_current >= 0) {

Modified: trunk/roadmap/src/roadmap_label.c
===================================================================
--- trunk/roadmap/src/roadmap_label.c	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_label.c	2015-05-31 23:07:43 UTC (rev 2804)
@@ -101,6 +101,8 @@
 
    int featuresize_sq;
 
+   int is_place;
+   PluginPlace place;
    PluginLine line;
    PluginStreet street;
    char *text;
@@ -251,8 +253,8 @@
   if (pen!=0)
     roadmap_canvas_select_pen (pen);
   else
+#endif
     roadmap_canvas_select_pen (RoadMapLabelPen);
-#endif
                
    if (doing_angles) {
       roadmap_screen_text_angle
@@ -301,6 +303,7 @@
 int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
                        int featuresize_sq, const PluginLine *line) {
 #endif
+   PluginPlace noplace = {ROADMAP_PLUGIN_ID, 0, 0, 0};
 
    roadmap_label *cPtr = 0;
 
@@ -318,7 +321,7 @@
       if (RoadMapLabelCacheFull) return -1;
 
       if (RoadMapLabelCacheAlloced == MAX_LABELS) {
-         roadmap_log (ROADMAP_WARNING, "Too many streets to label them all.");
+         roadmap_log (ROADMAP_WARNING, "Not enough room for labels.");
          RoadMapLabelCacheFull = 1;
          return -1;
       }
@@ -333,6 +336,8 @@
    cPtr->bbox.minx = 1;
    cPtr->bbox.maxx = -1;
 
+   cPtr->is_place = 0;
+   cPtr->place = noplace;
    cPtr->line = *line;
    cPtr->featuresize_sq = featuresize_sq;
    cPtr->angle = normalize_angle(angle);
@@ -358,6 +363,69 @@
    return 0;
 }
 
+#if defined(ROADMAP_ADVANCED_STYLE)
+int roadmap_label_add_place (const RoadMapGuiPoint *point,
+		       const PluginPlace *place, RoadMapPen pen) {
+#else
+int roadmap_label_add_place (const RoadMapGuiPoint *point,
+			const PluginPlace *place) {
+#endif
+   PluginLine noline = {ROADMAP_PLUGIN_ID, 0, 0, 0};
+
+   roadmap_label *cPtr = 0;
+
+   if (!ROADMAP_LIST_EMPTY(&RoadMapLabelSpares)) {
+      cPtr = (roadmap_label *)roadmap_list_remove
+                               (ROADMAP_LIST_FIRST(&RoadMapLabelSpares));
+      if (cPtr->text && *cPtr->text) {
+         free(cPtr->text);
+      }
+   } else {
+      if (RoadMapLabelCacheFull) return -1;
+
+      if (RoadMapLabelCacheAlloced == MAX_LABELS) {
+         roadmap_log (ROADMAP_WARNING, "Not enough room for labels.");
+         RoadMapLabelCacheFull = 1;
+         return -1;
+      }
+      cPtr = malloc (sizeof (*cPtr));
+      roadmap_check_allocated (cPtr);
+      RoadMapLabelCacheAlloced++;
+   }
+
+   cPtr->notext = 0;
+   cPtr->text = NULL;
+
+   cPtr->bbox.minx = 1;
+   cPtr->bbox.maxx = -1;
+
+   cPtr->is_place = 1;
+   cPtr->place = *place;
+   cPtr->line = noline;
+   cPtr->featuresize_sq = 9999;
+   cPtr->angle = 0;
+
+   cPtr->center_point = *point;
+#if defined(ROADMAP_ADVANCED_STYLE)
+   cPtr->pen = pen;
+#endif
+
+   /* The stored point is not screen oriented, rotate is needed */
+   roadmap_math_rotate_coordinates (1, &cPtr->center_point);
+
+
+   /* the "generation" of a label is refreshed when it is re-added.
+    * later, labels cache entries can be aged, and discarded.
+    */
+   cPtr->gen = RoadMapLabelGeneration;
+
+   cPtr->zoom = RoadMapLabelCurrentZoom;
+
+   roadmap_list_append(&RoadMapLabelNew, &cPtr->link);
+
+   return 0;
+}
+
 int roadmap_label_draw_cache (int angles) {
 
    RoadMapListItem *item, *tmp;
@@ -389,7 +457,6 @@
            (whichlist == OLDLIST ? &RoadMapLabelCache : &RoadMapLabelNew,
                 item, tmp) {
 
-         PluginStreetProperties properties;
 
          cPtr = (roadmap_label *)item;
 
@@ -407,8 +474,9 @@
             ROADMAP_LIST_FOR_EACH (&RoadMapLabelNew, item2, tmp2) {
                ncPtr = (roadmap_label *)item2;
 
-               if (roadmap_plugin_same_line (&cPtr->line, &ncPtr->line)) {
-                   /* Found a new version of this existing line */
+               if ((!cPtr->is_place && roadmap_plugin_same_line (&cPtr->line, &ncPtr->line)) ||
+        	    (cPtr->is_place && roadmap_plugin_same_place (&cPtr->place, &ncPtr->place))) {
+                   /* Found a new version of this existing place or line */
 
                    if (cPtr->notext) {
                      cPtr->gen = ncPtr->gen;
@@ -466,22 +534,43 @@
 
          if (!cPtr->text) {
 
-            roadmap_plugin_activate_db (&cPtr->line);
-            roadmap_plugin_get_street_properties (&cPtr->line, &properties);
+	    if (cPtr->is_place) {
+		const char *name;
+		name = roadmap_plugin_get_placename (&cPtr->place);
+		if (!name) {
+		    cPtr->text = "";
+		} else {
+	            cPtr->text = strdup(name);
+		}
+#if LABEL_USING_LINEID
+		{
+		    char buf[40];
+		    sprintf(buf, "x%d", cPtr->place.place_id);
+		    cPtr->otext = cPtr->text;
+		    cPtr->text = strdup(buf);
+		}
+#endif
+		roadmap_log(ROADMAP_DEBUG, "place text is '%s' (%p)", cPtr->text, cPtr->text);
+	    } else {
+        	PluginStreetProperties properties;
+		roadmap_plugin_activate_db (&cPtr->line);
+		roadmap_plugin_get_street_properties (&cPtr->line, &properties);
 
-            if (!properties.street || !*properties.street) {
-               cPtr->text = "";
-            } else {
+		if (!properties.street || !*properties.street) {
+		   cPtr->text = "";
+		} else {
+		   cPtr->text = strdup(properties.street);
+		}
 #if LABEL_USING_LINEID
-               char buf[40];
-               sprintf(buf, "%d", cPtr->line.line_id);
-               cPtr->text = strdup(buf);
-               cPtr->otext = strdup(properties.street);
-#else
-               cPtr->text = strdup(properties.street);
+		{
+		   char buf[40];
+		   sprintf(buf, "%d", cPtr->line.line_id);
+		   cPtr->otext = cPtr->text;
+		   cPtr->text = strdup(buf);
+		}
 #endif
-            }
-            cPtr->street = properties.plugin_street;
+		cPtr->street = properties.plugin_street;
+	    }
          }
 
          if (!*cPtr->text) {

Modified: trunk/roadmap/src/roadmap_label.h
===================================================================
--- trunk/roadmap/src/roadmap_label.h	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_label.h	2015-05-31 23:07:43 UTC (rev 2804)
@@ -35,9 +35,13 @@
 int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
                        int featuresize, const PluginLine *line, 
                        RoadMapPen pen);
+int roadmap_label_add_place (const RoadMapGuiPoint *point,
+		       const PluginPlace *place, RoadMapPen pen);
 #else
 int roadmap_label_add (const RoadMapGuiPoint *point, int angle,
                        int featuresize, const PluginLine *line);
+int roadmap_label_add_place (const RoadMapGuiPoint *point,
+			const PluginPlace *place);
 #endif
 
 int roadmap_label_activate (void);

Modified: trunk/roadmap/src/roadmap_layer.c
===================================================================
--- trunk/roadmap/src/roadmap_layer.c	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_layer.c	2015-05-31 23:07:43 UTC (rev 2804)
@@ -332,6 +332,33 @@
     return count;
 }
 
+int roadmap_layer_visible_places (int *layers, int size, unsigned int pen_index)
+{
+    int i;
+    int count = 0;
+
+    RoadMapLayer *layerp;
+
+
+    if (RoadMapLayerCurrentClass == NULL) return 0;
+
+    for (i = 0; i < RoadMapLayerCurrentClass->places_count; i++) {
+
+        layerp = RoadMapLayerCurrentClass->layers + i;
+
+        if (pen_index >= layerp->pen_count) continue;
+        if (! layerp->in_use[pen_index]) continue;
+
+        if (roadmap_layer_is_visible (layerp)) {
+           if (count >= size) goto done;
+           layers[count++] = i + 1;
+        }
+    }
+
+done:
+    return count;
+}
+
 /**
  * @brief
  */
@@ -349,9 +376,7 @@
 
        layerp = RoadMapLayerCurrentClass->layers + i;
 
-	roadmap_log(ROADMAP_DEBUG, "r_l_a: checking layer %s", layerp->name);
        if (roadmap_layer_is_visible(layerp)) {
-	roadmap_log(ROADMAP_DEBUG, "r_l_a: layer %s is visible", layerp->name);
 
             thickness =
                roadmap_math_thickness
@@ -504,7 +529,7 @@
 
 
    if (total > max) {
-      roadmap_log (ROADMAP_FATAL, "unsufficient space");
+      roadmap_log (ROADMAP_FATAL, "insufficient space");
    }
 
    for (i = total - 1; i >= 0; --i) {
@@ -746,7 +771,6 @@
     const char *class_config = roadmap_config_new (class_file, 0);
     const char *class_name;
 
-    roadmap_log (ROADMAP_DEBUG, "roadmap_layer_load_file(%s)", class_file);
     if (class_config == NULL) {
        roadmap_log (ROADMAP_FATAL, "cannot access class file %s", class_file);
     }
@@ -910,7 +934,8 @@
 
         /* Create all necessary pens. */
 
-        if (i >= lines_count + places_count) { /* This is a polygon. */
+        if (i < places_count || i >= lines_count + places_count) {
+           /* this is a place or a polygon */
            layer->in_use[0] = 1;
         }
 
@@ -955,9 +980,11 @@
              }
            }
 
-           if (i >= lines_count + places_count) { /* This is a polygon. */
-              layer->in_use[pen_index] = 1;
+           if (i < places_count || i >= lines_count + places_count) {
+              /* this is a place or a polygon */
+              layer->in_use[0] = 1;
            }
+
         }
     }
     

Modified: trunk/roadmap/src/roadmap_layer.h
===================================================================
--- trunk/roadmap/src/roadmap_layer.h	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_layer.h	2015-05-31 23:07:43 UTC (rev 2804)
@@ -88,6 +88,7 @@
 int roadmap_layer_navigable (int mode, int *layers, int size);
 
 int  roadmap_layer_visible_lines (int *layers, int size, unsigned int pen_index);
+int roadmap_layer_visible_places (int *layers, int size, unsigned int pen_index);
 
 int  roadmap_layer_line_is_visible (int layer);
 

Modified: trunk/roadmap/src/roadmap_locator.c
===================================================================
--- trunk/roadmap/src/roadmap_locator.c	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_locator.c	2015-05-31 23:07:43 UTC (rev 2804)
@@ -45,6 +45,7 @@
 #include "roadmap_square.h"
 #include "roadmap_shape.h"
 #include "roadmap_line.h"
+#include "roadmap_place.h"
 #include "roadmap_street.h"
 #include "roadmap_polygon.h"
 #include "roadmap_osm.h"
@@ -121,6 +122,9 @@
             (RoadMapCountyModel, "line", &RoadMapLineHandler);
       RoadMapCountyModel =
          roadmap_db_register
+            (RoadMapCountyModel, "place", &RoadMapPlaceHandler);
+      RoadMapCountyModel =
+         roadmap_db_register
             (RoadMapCountyModel, "point", &RoadMapPointHandler);
       RoadMapCountyModel =
          roadmap_db_register

Modified: trunk/roadmap/src/roadmap_place.c
===================================================================
--- trunk/roadmap/src/roadmap_place.c	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_place.c	2015-05-31 23:07:43 UTC (rev 2804)
@@ -47,6 +47,7 @@
 #include "roadmap_place.h"
 #include "roadmap_square.h"
 
+#include "roadmap_dictionary.h"
 
 static char *RoadMapPlaceType = "RoadMapPlaceContext";
 
@@ -58,6 +59,7 @@
    char *type;
 
    int  *Place;
+   RoadMapString *NameByPlace;
    int   PlaceCount;
 
    int  *PlaceByLayer;
@@ -66,6 +68,8 @@
    RoadMapPlaceBySquare *PlaceBySquare;
    int                   PlaceBySquareCount;
 
+   RoadMapDictionary PlaceNames;
+
 } RoadMapPlaceContext;
 
 static RoadMapPlaceContext *RoadMapPlaceActive = NULL;
@@ -80,6 +84,7 @@
    RoadMapPlaceContext *context;
 
    roadmap_db *place_table;
+   roadmap_db *name_table;
    roadmap_db *layer_table;
    roadmap_db *square_table;
 
@@ -92,22 +97,32 @@
    context->type = RoadMapPlaceType;
 
    place_table   = roadmap_db_get_subsection (root, "data");
+   name_table   = roadmap_db_get_subsection (root, "name");
    layer_table   = roadmap_db_get_subsection (root, "bylayer");
    square_table  = roadmap_db_get_subsection (root, "bysquare");
 
    context->Place = (int *) roadmap_db_get_data (place_table);
    context->PlaceCount = roadmap_db_get_count (place_table);
-
    if (roadmap_db_get_size (place_table) != context->PlaceCount * sizeof(int)) {
-      roadmap_log (ROADMAP_ERROR, "invalid place/data structure (1)");
+      roadmap_log (ROADMAP_ERROR, "invalid place/size values");
       goto roadmap_place_map_abort;
    }
 
+   context->NameByPlace = (RoadMapString *) roadmap_db_get_data (name_table);
+   if (context->PlaceCount != roadmap_db_get_count (name_table)) {
+      roadmap_log (ROADMAP_ERROR, "invalid name/count values");
+      goto roadmap_place_map_abort;
+   }
+   if (roadmap_db_get_size (name_table) != context->PlaceCount * sizeof(RoadMapString)) {
+      roadmap_log (ROADMAP_ERROR, "invalid name/size values");
+      goto roadmap_place_map_abort;
+   }
+
    context->PlaceByLayer = (int *) roadmap_db_get_data (layer_table);
    context->PlaceByLayerCount = roadmap_db_get_count (layer_table);
 
    if (roadmap_db_get_size (layer_table) != context->PlaceByLayerCount * sizeof(int)) {
-      roadmap_log (ROADMAP_ERROR, "invalid place/bylayer structure (2)");
+      roadmap_log (ROADMAP_ERROR, "invalid layer/size values");
       goto roadmap_place_map_abort;
    }
 
@@ -117,10 +132,12 @@
 
    if (roadmap_db_get_size (square_table) !=
        context->PlaceBySquareCount * sizeof(RoadMapPlaceBySquare)) {
-      roadmap_log (ROADMAP_ERROR, "invalid place/bysquare structure");
+      roadmap_log (ROADMAP_ERROR, "invalid square/size values");
       goto roadmap_place_map_abort;
    }
 
+   context->PlaceNames    = NULL;
+
    return context;
 
 roadmap_place_map_abort:
@@ -140,6 +157,9 @@
    if (place_context && place_context->type != RoadMapPlaceType) {
       roadmap_log (ROADMAP_FATAL, "invalid place context activated");
    }
+   if (place_context->PlaceNames == NULL) {
+      place_context->PlaceNames = roadmap_dictionary_open ("city");
+   }
    RoadMapPlaceActive = place_context;
 }
 
@@ -154,6 +174,9 @@
    if (place_context->type != RoadMapPlaceType) {
       roadmap_log (ROADMAP_FATAL, "unmapping invalid place context");
    }
+   if (RoadMapPlaceActive == place_context) {
+      RoadMapPlaceActive = NULL;
+   }
    free (place_context);
 }
 
@@ -179,16 +202,13 @@
 
    int *index;
 
-   if (RoadMapPlaceActive == NULL) return 0; /* No line. */
+   if (RoadMapPlaceActive == NULL) return 0; /* No place. */
 
    square = roadmap_square_index(square);
    if (square < 0) {
       return 0;   /* This square is empty. */
    }
 
-   if (layer <= 0 || layer > RoadMapPlaceActive->PlaceBySquare[square].count) {
-      return 0;
-   }
    index = RoadMapPlaceActive->PlaceByLayer
               + RoadMapPlaceActive->PlaceBySquare[square].first;
 
@@ -222,3 +242,13 @@
    return RoadMapPlaceActive->PlaceCount;
 }
 
+const char *roadmap_place_get_name(int place_id)
+{
+    RoadMapString stringid;
+
+    stringid = RoadMapPlaceActive->NameByPlace[place_id];
+
+    return roadmap_dictionary_get(RoadMapPlaceActive->PlaceNames, stringid);
+}
+
+

Modified: trunk/roadmap/src/roadmap_place.h
===================================================================
--- trunk/roadmap/src/roadmap_place.h	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_place.h	2015-05-31 23:07:43 UTC (rev 2804)
@@ -32,6 +32,8 @@
 
 int  roadmap_place_count (void);
 
+const char *roadmap_place_get_name(int place_id);
+
 extern roadmap_db_handler RoadMapPlaceHandler;
 
 #endif // _ROADMAP_PLACE__H_

Modified: trunk/roadmap/src/roadmap_plugin.c
===================================================================
--- trunk/roadmap/src/roadmap_plugin.c	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_plugin.c	2015-05-31 23:07:43 UTC (rev 2804)
@@ -33,6 +33,7 @@
 #include "roadmap_locator.h"
 #include "roadmap_street.h"
 #include "roadmap_shape.h"
+#include "roadmap_place.h"
 #include "roadmap_file.h"
 #include "roadmap_library.h"
 #include "roadmap_gps.h"
@@ -168,6 +169,20 @@
 }
 
 /**
+ * @brief are the two places the same ?
+ * @param line1
+ * @param line2
+ * @return
+ */
+int roadmap_plugin_same_place (const PluginPlace *place1,
+                              const PluginPlace *place2) {
+
+   return ( (place1->plugin_id == place2->plugin_id) &&
+            (place1->place_id == place2->place_id) &&
+            (place1->fips == place2->fips) );
+}
+
+/**
  * @brief
  * @param street1
  * @param street2
@@ -514,6 +529,11 @@
    }
 }
 
+const char *roadmap_plugin_get_placename (const PluginPlace *place)
+{
+    return roadmap_place_get_name (place->place_id);
+}
+
 #if 0
 void roadmap_plugin_get_street_properties (const PluginLine *line,
                                            PluginStreetProperties *props,

Modified: trunk/roadmap/src/roadmap_plugin.h
===================================================================
--- trunk/roadmap/src/roadmap_plugin.h	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_plugin.h	2015-05-31 23:07:43 UTC (rev 2804)
@@ -61,7 +61,15 @@
    int fips;
 
 } PluginLine;
+typedef struct {
 
+   int plugin_id;
+   int place_id;
+   int layer;
+   int fips;
+
+} PluginPlace;
+
 typedef struct {
 
    int plugin_id;
@@ -110,6 +118,9 @@
 int  roadmap_plugin_same_line (const PluginLine *line1,
                                const PluginLine *line2);
 
+int  roadmap_plugin_same_place (const PluginPlace *place1,
+                               const PluginPlace *place2);
+
 int  roadmap_plugin_same_street (const PluginStreet *street1,
                                  const PluginStreet *street2);
 
@@ -313,4 +324,5 @@
 void roadmap_plugin_update_position (const RoadMapPosition *,
 		const PluginLine *, const PluginStreet *, const int);
 
+const char *roadmap_plugin_get_placename (const PluginPlace *place);
 #endif /* INCLUDED__ROADMAP_PLUGIN__H */

Modified: trunk/roadmap/src/roadmap_screen.c
===================================================================
--- trunk/roadmap/src/roadmap_screen.c	2015-05-31 23:07:40 UTC (rev 2803)
+++ trunk/roadmap/src/roadmap_screen.c	2015-05-31 23:07:43 UTC (rev 2804)
@@ -41,6 +41,7 @@
 #include "roadmap_layer.h"
 #include "roadmap_square.h"
 #include "roadmap_line.h"
+#include "roadmap_place.h"
 #include "roadmap_shape.h"
 #include "roadmap_point.h"
 #include "roadmap_polygon.h"
@@ -1044,7 +1045,7 @@
     return 1;
 }
 
-static int roadmap_screen_draw_square
+static int roadmap_screen_draw_square_lines
               (int square, int layer, int fully_visible, int pen_index) {
 
    int line;
@@ -1056,7 +1057,7 @@
    int fips;
    int drawn = 0;
 
-   roadmap_log_push ("roadmap_screen_draw_square");
+   roadmap_log_push ("roadmap_screen_draw_square_lines");
 
    layer_pen = roadmap_layer_get_pen (layer, pen_index);
    if (layer_pen == NULL) return 0;
@@ -1271,7 +1272,56 @@
    return drawn;
 }
 
+static int roadmap_screen_draw_square_places
+              (int square, int layer, int fully_visible, int pen_index) {
 
+   int place;
+   int first_place;
+   int last_place;
+   RoadMapPen layer_pen;
+   int fips;
+   int drawn = 0;
+
+   roadmap_log_push ("roadmap_screen_draw_square_places");
+
+   layer_pen = roadmap_layer_get_pen (layer, pen_index);
+   if (layer_pen == NULL) return 0;
+   
+   fips = roadmap_locator_active ();
+
+   /* Draw each place that belongs to this square. */
+   if (roadmap_place_in_square (square, layer, &first_place, &last_place) > 0) {
+
+      for (place = first_place; place <= last_place; ++place) {
+	    RoadMapPosition pos;
+	    RoadMapGuiPoint guipoint;
+
+	    roadmap_place_point(place, &pos);
+            roadmap_math_coordinate (&pos, &guipoint);
+#if PLACE_MARK
+	    roadmap_sprite_draw ("PurpleCross" , &guipoint, 0);
+		    roadmap_math_rotate_coordinates (1, &guipoint);
+	    roadmap_canvas_set_foreground("black");
+#endif
+
+	    if ((pen_index == 0) &&   /* we do labels only for the first pen */
+		    !RoadMapScreenDragging &&
+		    RoadMapScreenLabels) {
+		PluginPlace p = {ROADMAP_PLUGIN_ID, place, layer, fips};
+#if defined(ROADMAP_ADVANCED_STYLE)
+		roadmap_label_add_place (&guipoint, &p, layer_pen);
+#else
+		roadmap_label_add_place (&guipoint, &p);
+#endif
+		drawn += 1;
+	    }
+      }
+   }
+
+   roadmap_log_pop ();
+   return drawn;
+}
+
 static void roadmap_screen_draw_sprite_object
                (const char               *name,
                 const char               *sprite,
@@ -1388,7 +1438,7 @@
 
 
 static int roadmap_screen_repaint_square (int square, int pen_type, 
-                                          int layer_count, int *layers) {
+		      int layer_count, int *layers, int lines) {
 
    int i;
 
@@ -1433,13 +1483,20 @@
 
         category = layers[i];
 
-        drawn += roadmap_screen_draw_square
+	if (lines) {
+            drawn += roadmap_screen_draw_square_lines
                     (square, category, fully_visible, pen_type);
+	} else { // places
+            drawn += roadmap_screen_draw_square_places
+                    (square, category, fully_visible, pen_type);
+	}
 
    }
 
-   roadmap_screen_flush_lines();
-   roadmap_screen_flush_points();
+   if (lines) {
+       roadmap_screen_flush_lines();
+       roadmap_screen_flush_points();
+   }
 
    roadmap_log_pop ();
    
@@ -1474,7 +1531,7 @@
     int pen;
     int count, sqcount;
     int *drawnlist;
-    int max_pen = roadmap_layer_max_pen();
+    int max_pen;
     static int nomap;
     
     if (!RoadMapScreenDragging && RoadMapScreenFrozen) return;
@@ -1483,6 +1540,8 @@
     if (RoadMapScreenDragging &&
         (! roadmap_config_match(&RoadMapConfigStylePrettyDrag, "yes"))) {
        max_pen = 1;
+    } else {
+       max_pen = roadmap_layer_max_pen();
     }
 
     roadmap_math_display_context(1);
@@ -1534,6 +1593,7 @@
     drawnlist = (int *)calloc(count, sizeof(int));
     roadmap_check_allocated(drawnlist);
 
+    /* -- debugging squares -- */
     if (roadmap_is_visible (ROADMAP_SHOW_GLOBAL_SQUARE)) {
 	/* draw global square outline (with "--square" or "--map-boxes") */
 	for (i = count-1; i >= 0; --i) {
@@ -1545,6 +1605,7 @@
         }
     }
 
+    /* -- polygons -- */
     for (i = count-1; i >= 0; --i) {
         /* -- nothing to draw at this zoom? -- */
         if (roadmap_locator_get_decluttered(fipslist[i]))
@@ -1563,6 +1624,7 @@
 
     }
 
+    /* -- lines -- */
     for (i = count-1; i >= 0; --i) {
         /* -- nothing to draw at this zoom? -- */
         if (roadmap_locator_get_decluttered(fipslist[i]))
@@ -1596,7 +1658,7 @@
 
                for (sq = sqcount - 1; sq >= 0; --sq) {
                   drawnlist[i] += roadmap_screen_repaint_square (in_view[sq],
-		  	pen, layer_count, layers);
+		  	pen, layer_count, layers, 1);
 
                }
             }
@@ -1617,13 +1679,61 @@
         
     }
 
+    /* -- places -- */
     for (i = count-1; i >= 0; --i) {
         /* -- nothing to draw at this zoom? -- */
         if (roadmap_locator_get_decluttered(fipslist[i]))
             continue;
 
         /* -- Access the county's database. */
+        if (roadmap_locator_activate (fipslist[i]) != ROADMAP_US_OK)
+	    continue;
 
+        /* -- Look for the squares that are currently visible. */
+        sqcount = roadmap_square_view (&in_view);
+
+        for (pen = 0; pen < max_pen; ++pen) {
+
+            if (sqcount > 0) {
+               static int *layers = NULL;
+               static int  layers_size = 0;
+               int layer_count;
+
+               roadmap_screen_reset_square_mask();
+
+               if (layers == NULL) {
+                  layers_size = roadmap_layer_max_defined();
+                  layers = (int *)calloc (layers_size, sizeof(int));
+                  roadmap_check_allocated(layers);
+               }
+               layer_count = roadmap_layer_visible_places
+                                (layers, layers_size, pen);
+               if (!layer_count) continue;
+
+               for (sq = sqcount - 1; sq >= 0; --sq) {
+                  drawnlist[i] += roadmap_screen_repaint_square (in_view[sq],
+		  	pen, layer_count, layers, 0);
+	       }
+
+	    }
+	}
+
+        if (roadmap_screen_repaint_leave(count, count - i)) {
+            roadmap_label_new_invalidate();
+            goto out;
+        }
+
+    }
+
+
+    /* -- labels -- */
+    for (i = count-1; i >= 0; --i) {
+        /* -- nothing to draw at this zoom? -- */
+        if (roadmap_locator_get_decluttered(fipslist[i]))
+            continue;
+
+        /* -- Access the county's database. */
+
         if (roadmap_locator_activate (fipslist[i]) != ROADMAP_US_OK) continue;
 
         if (drawnlist[i] && !RoadMapScreenDragging) {
@@ -2198,8 +2308,8 @@
 }
 
 
-void roadmap_screen_text
-     (int id, RoadMapGuiPoint *center, int where, int size, const char *text) {
+void roadmap_screen_text (int id, RoadMapGuiPoint *center, int where,
+		int size, const char *text) {
     if ((RoadMapLineFontSelect & id) != 0) {
         roadmap_linefont_text ( center, where, size, text);
     } else {
@@ -2207,9 +2317,9 @@
     }
 }
 
-void roadmap_screen_text_angle 
-        (int id, RoadMapGuiPoint *center,
+void roadmap_screen_text_angle (int id, RoadMapGuiPoint *center,
                 int theta, int size, const char *text) {
+
     if ((RoadMapLineFontSelect & id) != 0) {
         roadmap_linefont_text_angle ( center, size, theta, text);
     } else {
@@ -2227,8 +2337,7 @@
  * @param descent
  * @param can_tilt
  */
-void roadmap_screen_text_extents 
-        (int id, const char *text, int size,
+void roadmap_screen_text_extents (int id, const char *text, int size,
          int *width, int *ascent, int *descent, int *can_tilt) {
     if ((RoadMapLineFontSelect & id) != 0) {
         roadmap_linefont_extents

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (92)	Dec (141)
2006	Jan (126)	Feb (72)	Mar (31)	Apr (200)	May (81)	Jun (130)	Jul (112)	Aug (134)	Sep (76)	Oct (89)	Nov (153)	Dec (9)
2007	Jan (59)	Feb (82)	Mar (50)	Apr (20)	May (9)	Jun (81)	Jul (41)	Aug (109)	Sep (91)	Oct (87)	Nov (33)	Dec (60)
2008	Jan (21)	Feb (15)	Mar (38)	Apr (75)	May (59)	Jun (46)	Jul (30)	Aug (20)	Sep (35)	Oct (32)	Nov (34)	Dec (19)
2009	Jan (29)	Feb (71)	Mar (54)	Apr (17)	May (4)	Jun	Jul (3)	Aug	Sep	Oct	Nov	Dec (3)
2010	Jan	Feb	Mar	Apr	May	Jun	Jul (3)	Aug (58)	Sep (7)	Oct (7)	Nov (12)	Dec (18)
2011	Jan (17)	Feb (29)	Mar (11)	Apr (5)	May (1)	Jun	Jul	Aug (11)	Sep	Oct	Nov	Dec
2012	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun (87)	Jul	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May (44)	Jun (79)	Jul (16)	Aug (31)	Sep	Oct (51)	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec

roadmap-commit Mailing List for RoadMap (Page 9)

roadmap-commit — track CVS commits