osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5016 - No markers show up when maps are displayed. 

#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=45146
This commit is contained in:
Chris Maynard 2012-09-26 03:30:48 +00:00
parent c0c2466d00
commit 839862cd08
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipmap.html
View File

@ -55,9 +55,9 @@
new OpenLayers.Control.ZoomBox(),
new OpenLayers.Control.ScaleLine(),
new OpenLayers.Control.MousePosition(),
new OpenLayers.Control.MouseDefaults(),
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.Attribution()
],
]
//projection: new OpenLayers.Projection("EPSG:900913"),
//displayProjection: new OpenLayers.Projection("EPSG:4326"),
//maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34, 20037508.34, 20037508.34),

7
ui/gtk/hostlist_table.c
View File

@ -937,6 +937,7 @@ static gboolean
map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
gpointer data)
{
static char *opener = "{\n";
map_t *map = (map_t *)data;
gchar *table_entry, *esc_entry;
guint64 value;
@ -962,7 +963,7 @@ map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
},
*/
fputs("{\n", map->out_file);
fputs(opener, map->out_file);
fputs(" 'type': 'Feature', 'geometry': { 'type': 'Point', 'coordinates': [", map->out_file);
/* Longitude */
@ -1027,7 +1028,9 @@ map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
/* XXX - we could add specific icons, e.g. depending on the amount of packets or bytes */
fputs("' }\n", map->out_file);
fputs("},\n", map->out_file); /* XXX - Trim the comma from the last item */
fputs("}", map->out_file);
opener = ",\n{\n";
map->hosts_written = TRUE;
return FALSE;