]> err.no Git - libchamplain/log
libchamplain
15 years agoRename Gtk2::Champlain::ViewEmbed to Gtk2::ChamplainEmbed
Emmanuel Rodriguez [Sat, 13 Jun 2009 14:32:37 +0000 (16:32 +0200)]
Rename Gtk2::Champlain::ViewEmbed to Gtk2::ChamplainEmbed

15 years agoRename Gtk2::Champlain::ViewEmbed to Gtk2::ChamplainEmbed
Emmanuel Rodriguez [Sat, 13 Jun 2009 14:30:38 +0000 (16:30 +0200)]
Rename Gtk2::Champlain::ViewEmbed to Gtk2::ChamplainEmbed

The C API for gtk_champlain_view_embed has been changed and the methods are now
prefixed with gtk_champlain_embed.

15 years agoReplace champlain_map_source_factory_get_list by champlain_map_source_factory_dup_list
Emmanuel Rodriguez [Sat, 13 Jun 2009 13:51:00 +0000 (15:51 +0200)]
Replace champlain_map_source_factory_get_list by champlain_map_source_factory_dup_list

15 years agoChamplain::MapSourceDesc is now a GBoxed type.
Emmanuel Rodriguez [Sat, 13 Jun 2009 13:29:54 +0000 (15:29 +0200)]
Champlain::MapSourceDesc is now a GBoxed type.

This is supposed to make the bindings easier. This patch is still untested.

15 years agoAllow libsoup to use more connections per host
Pierre-Luc Beaudoin [Sat, 13 Jun 2009 22:26:56 +0000 (18:26 -0400)]
Allow libsoup to use more connections per host

8 is apparently the default on Firefox and Opera, this dramatically
improve loading speeds at the cost of server ressources

15 years agoFix array usage in ChamplainZoomLevel
Pierre-Luc Beaudoin [Sat, 13 Jun 2009 22:18:39 +0000 (18:18 -0400)]
Fix array usage in ChamplainZoomLevel

Based on how the array was iterated, it wasn't rare that the requested
index would be well over the array's end.

15 years agoAbort any pending network requests when the source is disposed
Pierre-Luc Beaudoin [Sat, 13 Jun 2009 21:31:17 +0000 (17:31 -0400)]
Abort any pending network requests when the source is disposed

15 years agoIgnore some new files
Pierre-Luc Beaudoin [Sat, 13 Jun 2009 20:28:05 +0000 (16:28 -0400)]
Ignore some new files

15 years agoStop any ongoing animation before disposing
Pierre-Luc Beaudoin [Sat, 13 Jun 2009 20:27:52 +0000 (16:27 -0400)]
Stop any ongoing animation before disposing

15 years agoAdd guards to ChamplainMapSource functions
Pierre-Luc Beaudoin [Sat, 13 Jun 2009 15:37:51 +0000 (11:37 -0400)]
Add guards to ChamplainMapSource functions

15 years agoRename GTK_CHAMPLAIN_TYPE_EMBED to GTK_TYPE_CHAMPLAIN_EMBED to match Gtk's
Pierre-Luc Beaudoin [Sat, 13 Jun 2009 14:23:19 +0000 (10:23 -0400)]
Rename GTK_CHAMPLAIN_TYPE_EMBED to GTK_TYPE_CHAMPLAIN_EMBED to match Gtk's

15 years agoMake the cache expire 1 day
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 05:20:46 +0000 (01:20 -0400)]
Make the cache expire 1 day

1 hour was ridicoulous and adds unnecessary stress on the servers

15 years agoRegister ChamplainMapSourceDesc as a G_TYPE_BOXED
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 04:51:52 +0000 (00:51 -0400)]
Register ChamplainMapSourceDesc as a G_TYPE_BOXED

15 years agoRename ChamplainViewEmbed to GtkChamplainEmbed
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 04:34:58 +0000 (00:34 -0400)]
Rename ChamplainViewEmbed to GtkChamplainEmbed

This removes the 2 view duality problem.  It also solves
issues where the ChamplainView would load data into clutter
before the stages even existed (giving OpenGl errors).

15 years agoMake ChamplainViewEmbed create ChamplainView for the user
Pierre-Luc Beaudoin [Thu, 21 May 2009 22:32:48 +0000 (18:32 -0400)]
Make ChamplainViewEmbed create ChamplainView for the user

15 years agoMake it possible to create ChamplainView after ChamplainViewEmbed
Pierre-Luc Beaudoin [Thu, 21 May 2009 22:21:14 +0000 (18:21 -0400)]
Make it possible to create ChamplainView after ChamplainViewEmbed

If not, the first tiles could be loaded while the stage isn't created yet,
resulting in COGL errors.

15 years agoFix Bug 584149: libchamplain should set the user agent on libsoup
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 03:46:39 +0000 (23:46 -0400)]
Fix Bug 584149: libchamplain should set the user agent on libsoup

15 years agoRemove non filename friendly caracters from map ids and use them as directory name
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 03:40:16 +0000 (23:40 -0400)]
Remove non filename friendly caracters from map ids and use them as directory name

15 years agoAdd parameters to map sources constructors
Emmanuel Rodriguez [Fri, 12 Jun 2009 03:35:01 +0000 (23:35 -0400)]
Add parameters to map sources constructors

15 years agoDon't invoke gperl_callback_invoke() with the extra data gpointer.
Emmanuel Rodriguez [Tue, 19 May 2009 10:08:15 +0000 (12:08 +0200)]
Don't invoke gperl_callback_invoke() with the extra data gpointer.

The data gpointer is used to pass the Perl callback. It makes no sense to pass
it back to the Perl callback.

15 years agoTest the registration of a custom map source
Emmanuel Rodriguez [Tue, 19 May 2009 10:07:49 +0000 (12:07 +0200)]
Test the registration of a custom map source

15 years agoReplace all map constructors by a generic one.
Emmanuel Rodriguez [Tue, 19 May 2009 09:34:10 +0000 (11:34 +0200)]
Replace all map constructors by a generic one.

All map constructors can be replaced by a more generic one if the information in
the ChamplainMapSourceDesc is shared with the ChamplainMapSource and if the URL
for the tiles is passed as the extra parameter to the constructor.

15 years agoFixed the expected license for OpenAerialMap
Emmanuel Rodriguez [Tue, 19 May 2009 09:26:17 +0000 (11:26 +0200)]
Fixed the expected license for OpenAerialMap

15 years agoThe predefined map sources have the same in formation in the desc as in the map source.
Emmanuel Rodriguez [Tue, 19 May 2009 09:22:37 +0000 (11:22 +0200)]
The predefined map sources have the same in formation in the desc as in the map source.

The map names and licenses are the same now.

15 years agoMap description is no longer copy/pasted
Emmanuel Rodriguez [Mon, 18 May 2009 20:36:52 +0000 (22:36 +0200)]
Map description is no longer copy/pasted

The private map constructors are using the ChamplainMapSourceDesc for building
the maps. This eliminates all copy/paste.

15 years agoThe type gpointer is already a pointer. No need for gpointer *data
Emmanuel Rodriguez [Mon, 18 May 2009 19:57:10 +0000 (21:57 +0200)]
The type gpointer is already a pointer. No need for gpointer *data

15 years agoChamplain::MapSourceFactory->register() works with perl code refs
Emmanuel Rodriguez [Mon, 18 May 2009 19:36:32 +0000 (21:36 +0200)]
Champlain::MapSourceFactory->register() works with perl code refs

15 years agoSet the gpointer data of the builtin MapSources to NULL
Emmanuel Rodriguez [Mon, 18 May 2009 19:35:06 +0000 (21:35 +0200)]
Set the gpointer data of the builtin MapSources to NULL

15 years agochamplain_map_source_factory_register takes a constructor and a gpointer
Emmanuel Rodriguez [Mon, 18 May 2009 19:33:30 +0000 (21:33 +0200)]
champlain_map_source_factory_register takes a constructor and a gpointer

15 years agogpointer is already a pointer, no need for gpointer*
Emmanuel Rodriguez [Mon, 18 May 2009 19:30:24 +0000 (21:30 +0200)]
gpointer is already a pointer, no need for gpointer*

15 years agoChamplainMapSourceConstructor is more binding friendly.
Emmanuel Rodriguez [Mon, 18 May 2009 19:26:09 +0000 (21:26 +0200)]
ChamplainMapSourceConstructor is more binding friendly.

Since the constructor is a callback it is now passed an extra gpointer. This
will allow the bindings to properly pass a custom parameter that will wrap a
language defined function with the extra parameters.

The type ChamplainMapSourceDesc has been enhanced with an extra gpointer.

15 years agoReintroduce deleted functions and mark them as deprecated
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 03:18:20 +0000 (23:18 -0400)]
Reintroduce deleted functions and mark them as deprecated

They will be removed just before releasing 0.4.

15 years agoVersion bump to 0.3.3
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 02:18:10 +0000 (22:18 -0400)]
Version bump to 0.3.3

15 years agoget_list is now champlain_map_source_factory_dup_list
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 02:13:33 +0000 (22:13 -0400)]
get_list is now champlain_map_source_factory_dup_list

As the list is duplicated

15 years agoFix ChamplainPoint gtk documentation
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 02:08:14 +0000 (22:08 -0400)]
Fix ChamplainPoint gtk documentation

15 years agoFix configure warning
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 00:40:25 +0000 (20:40 -0400)]
Fix configure warning

15 years agoDefine ChamplainPoint as a G_TYPE_BOXED
Pierre-Luc Beaudoin [Fri, 12 Jun 2009 00:40:15 +0000 (20:40 -0400)]
Define ChamplainPoint as a G_TYPE_BOXED

15 years agoFix ChamplainPolygon documentation
Pierre-Luc Beaudoin [Wed, 10 Jun 2009 04:14:25 +0000 (00:14 -0400)]
Fix ChamplainPolygon documentation

15 years agoResize polygon actors on ChamplainView resize
Pierre-Luc Beaudoin [Wed, 10 Jun 2009 03:30:30 +0000 (23:30 -0400)]
Resize polygon actors on ChamplainView resize

Also add visibility

15 years agoHave each ChamplainPolygon have their ClutterActor
Pierre-Luc Beaudoin [Wed, 10 Jun 2009 02:49:06 +0000 (22:49 -0400)]
Have each ChamplainPolygon have their ClutterActor

15 years agoRefine the Polygon point API
Pierre-Luc Beaudoin [Wed, 10 Jun 2009 02:04:32 +0000 (22:04 -0400)]
Refine the Polygon point API

15 years agoRename Line to Polygon
Pierre-Luc Beaudoin [Wed, 10 Jun 2009 01:00:49 +0000 (21:00 -0400)]
Rename Line to Polygon

15 years agoBetter line demo
Pierre-Luc Beaudoin [Tue, 26 May 2009 02:48:38 +0000 (22:48 -0400)]
Better line demo

15 years agoImplement fill/stroke color, and stroke width
Pierre-Luc Beaudoin [Tue, 26 May 2009 02:48:28 +0000 (22:48 -0400)]
Implement fill/stroke color, and stroke width

15 years agoGet rid of double set of default values
Pierre-Luc Beaudoin [Tue, 26 May 2009 02:22:35 +0000 (22:22 -0400)]
Get rid of double set of default values

15 years agoAdd default stroke and fill colors
Pierre-Luc Beaudoin [Mon, 25 May 2009 23:22:03 +0000 (19:22 -0400)]
Add default stroke and fill colors

15 years agoFALSE is not NULL
Pierre-Luc Beaudoin [Mon, 25 May 2009 22:59:07 +0000 (18:59 -0400)]
FALSE is not NULL

15 years agoImplement shape filling and stroking
Pierre-Luc Beaudoin [Mon, 25 May 2009 04:22:40 +0000 (00:22 -0400)]
Implement shape filling and stroking

15 years agoMake the view draw many lines
Pierre-Luc Beaudoin [Mon, 25 May 2009 03:41:01 +0000 (23:41 -0400)]
Make the view draw many lines

15 years agoDraw the lines using Cairo
Pierre-Luc Beaudoin [Mon, 25 May 2009 02:10:15 +0000 (22:10 -0400)]
Draw the lines using Cairo

The lines are drawn on a cairo surface, which is updated
each time the view changes (zoom, center, scroll).

15 years agoIntroduce the API for route drawing
Pierre-Luc Beaudoin [Wed, 3 Jun 2009 21:01:07 +0000 (17:01 -0400)]
Introduce the API for route drawing

15 years agoFix error tile always showing up when no network connectivity
Pierre-Luc Beaudoin [Tue, 9 Jun 2009 14:08:11 +0000 (10:08 -0400)]
Fix error tile always showing up when no network connectivity

15 years agoFix coding style
Pierre-Luc Beaudoin [Tue, 9 Jun 2009 13:41:10 +0000 (09:41 -0400)]
Fix coding style

15 years agoRename Champlain::MapSourceFactory->get_default() to Champlain::MapSourceFactory...
Emmanuel Rodriguez [Sun, 7 Jun 2009 10:02:35 +0000 (12:02 +0200)]
Rename Champlain::MapSourceFactory->get_default() to Champlain::MapSourceFactory->dup_default()

15 years agoAdd DOAP project description
Pierre-Luc Beaudoin [Tue, 9 Jun 2009 02:06:14 +0000 (22:06 -0400)]
Add DOAP project description

15 years agoRename Champlain::MapSourceFactory->get_default() to Champlain::MapSourceFactory...
Emmanuel Rodriguez [Thu, 4 Jun 2009 20:16:32 +0000 (22:16 +0200)]
Rename Champlain::MapSourceFactory->get_default() to Champlain::MapSourceFactory->dup_default()

15 years agochamplain_network_map_source_fill_tile is no longer in the API
Emmanuel Rodriguez [Thu, 4 Jun 2009 19:46:18 +0000 (21:46 +0200)]
champlain_network_map_source_fill_tile is no longer in the API

Update the test and the XS file.

15 years agoSynchronized with the API changes made to the singletons.
Emmanuel Rodriguez [Wed, 3 Jun 2009 21:08:05 +0000 (23:08 +0200)]
Synchronized with the API changes made to the singletons.

champlain_map_source_factory_get_default -> champlain_map_source_factory_dup_default
champlain_cache_get_default -> champlain_cache_dup_default

15 years agoFix Bug 584775: build system installs "uninstalled" version of the packages
Pierre-Luc Beaudoin [Wed, 3 Jun 2009 21:19:43 +0000 (17:19 -0400)]
Fix Bug 584775: build system installs "uninstalled" version of the packages

Don't install -uninstalled.pc files

15 years agoFix Bug 583502: Center_on can be wrong
Pierre-Luc Beaudoin [Mon, 1 Jun 2009 02:37:34 +0000 (22:37 -0400)]
Fix Bug 583502: Center_on can be wrong

The TidyViewport's Adjustments were not initialized until
the size was set.

15 years agoFix Bug 584368 for ChamplainMapSourceFactory
Pierre-Luc Beaudoin [Sun, 31 May 2009 22:20:01 +0000 (18:20 -0400)]
Fix Bug 584368 for ChamplainMapSourceFactory

15 years agoFix Bug 584368 for ChamplainCache
Pierre-Luc Beaudoin [Sun, 31 May 2009 21:01:44 +0000 (17:01 -0400)]
Fix Bug 584368 for ChamplainCache

15 years agoFix Bug 584390: Cache doesn't work on first run
Pierre-Luc Beaudoin [Sun, 31 May 2009 20:19:15 +0000 (16:19 -0400)]
Fix Bug 584390: Cache doesn't work on first run

It turns out that the ~/.cache/champlain didn't exist
at the moment of the first cache request, resulting in
a error when creating cache.db which would later result
in more errors from SQLite preventing the cache from working.

15 years agoFix Bug 584365: "longitude" and "latitude" properties are reversed
Pierre-Luc Beaudoin [Sun, 31 May 2009 15:31:24 +0000 (11:31 -0400)]
Fix Bug 584365: "longitude" and "latitude" properties are reversed

15 years agoFix coding style
Pierre-Luc Beaudoin [Thu, 28 May 2009 14:09:07 +0000 (10:09 -0400)]
Fix coding style

15 years agoAlso unref the previous level
Pierre-Luc Beaudoin [Thu, 28 May 2009 04:38:01 +0000 (00:38 -0400)]
Also unref the previous level

15 years agoImplement proper dispose and finalize functions where needed
Pierre-Luc Beaudoin [Thu, 28 May 2009 04:37:49 +0000 (00:37 -0400)]
Implement proper dispose and finalize functions where needed

15 years agobump version
Stephane Delcroix [Wed, 27 May 2009 13:09:31 +0000 (15:09 +0200)]
bump version

15 years agodrop the dep down to gtk# 2.12
Stephane Delcroix [Wed, 27 May 2009 12:01:33 +0000 (14:01 +0200)]
drop the dep down to gtk# 2.12

15 years agoprefix factory ctors by Create, not New
Stephane Delcroix [Fri, 24 Apr 2009 08:14:26 +0000 (10:14 +0200)]
prefix factory ctors by Create, not New

15 years agoupdated
Stephane Delcroix [Thu, 23 Apr 2009 14:25:07 +0000 (16:25 +0200)]
updated

15 years agohide the private properties
Stephane Delcroix [Fri, 6 Mar 2009 10:46:45 +0000 (11:46 +0100)]
hide the private properties

15 years agogenerate ChamplainTile
Stephane Delcroix [Fri, 6 Mar 2009 10:46:14 +0000 (11:46 +0100)]
generate ChamplainTile

15 years agono longer hide ZoomLevel
Stephane Delcroix [Fri, 6 Mar 2009 10:22:50 +0000 (11:22 +0100)]
no longer hide ZoomLevel

15 years agoreparsing api
Stephane Delcroix [Fri, 6 Mar 2009 10:22:26 +0000 (11:22 +0100)]
reparsing api

15 years agoFail if either libsoup or libsoup-gnome are not found
Pierre-Luc Beaudoin [Sun, 24 May 2009 20:13:54 +0000 (16:13 -0400)]
Fail if either libsoup or libsoup-gnome are not found

15 years agoActually show is not working, realize happens in every cases
Pierre-Luc Beaudoin [Wed, 20 May 2009 22:56:50 +0000 (18:56 -0400)]
Actually show is not working, realize happens in every cases

15 years agoThe window has to be realized (on show) before setting the cursor
Pierre-Luc Beaudoin [Wed, 20 May 2009 21:39:39 +0000 (17:39 -0400)]
The window has to be realized (on show) before setting the cursor

15 years agoBetter handling of corrupted files and correctly report if the tile was loaded from...
Pierre-Luc Beaudoin [Wed, 20 May 2009 15:25:48 +0000 (11:25 -0400)]
Better handling of corrupted files and correctly report if the tile was loaded from cache

15 years agoFix Bug 582786: champlain_network_map_source_fill_tile should be private
Pierre-Luc Beaudoin [Tue, 19 May 2009 05:01:01 +0000 (01:01 -0400)]
Fix Bug 582786: champlain_network_map_source_fill_tile should be private

by making champlain_network_map_source_fill_tile a static function to
champlain-network-map-source.c

15 years agoGenerate the correctly named pc files
Pierre-Luc Beaudoin [Wed, 20 May 2009 14:39:14 +0000 (10:39 -0400)]
Generate the correctly named pc files

if champlain-0.3 is requested, pkgconfig will look for champlain-0.3-uninstalled
first, not champlain-uninstalled

15 years agoAdd comment on name
Pierre-Luc Beaudoin [Tue, 19 May 2009 13:30:58 +0000 (09:30 -0400)]
Add comment on name

15 years agoFix .pc.in files to have the correct paths
Pierre-Luc Beaudoin [Tue, 19 May 2009 13:13:19 +0000 (09:13 -0400)]
Fix .pc.in files to have the correct paths

15 years agoFix Bug 582448: Should provide uninstalled.pc files
Pierre-Luc Beaudoin [Tue, 19 May 2009 04:53:41 +0000 (00:53 -0400)]
Fix Bug 582448: Should provide uninstalled.pc files

This makes it easier to use an uninstalled copy of libchamplain to
compile other projects, by setting PKG_CONFIG_PATH when running their
autogen.sh or configure, like this:

PKG_CONFIG_PATH=$HOME/src/libchamplain-0.3/libchamplain ./autogen.sh

(The necessary directory to put on your PKG_CONFIG_PATH is the libchamplain
subdirectory of the source distribution or git checkout, not the
top-level directory.)

15 years agoFix bug: tiles without etag (in cache db) would always be reloaded.
Pierre-Luc Beaudoin [Tue, 19 May 2009 14:05:18 +0000 (10:05 -0400)]
Fix bug: tiles without etag (in cache db) would always be reloaded.

Not finding an etag isn't an error, some servers don't support them.

15 years agoRemove trailing spaces + coding style fix
Pierre-Luc Beaudoin [Tue, 19 May 2009 14:01:22 +0000 (10:01 -0400)]
Remove trailing spaces + coding style fix

15 years agoMove the popularity incrementation on idle
Pierre-Luc Beaudoin [Tue, 19 May 2009 13:51:01 +0000 (09:51 -0400)]
Move the popularity incrementation on idle

This function is taking a lot of time and doesn't need to
be run in sync.  Running it on idle restored performances
to levels similar to how they were before ChamplainCache was
introduced.

15 years agoRemove the debug used for profiling
Emmanuel Rodriguez [Wed, 13 May 2009 18:34:38 +0000 (20:34 +0200)]
Remove the debug used for profiling

15 years agoUpdate the SQL error messages
Emmanuel Rodriguez [Wed, 13 May 2009 18:23:45 +0000 (20:23 +0200)]
Update the SQL error messages

15 years agoSafer sqlite3 calls.
Emmanuel Rodriguez [Wed, 13 May 2009 15:29:18 +0000 (17:29 +0200)]
Safer sqlite3 calls.
  - Build queries with sqlite3_mprintf() instead of g_strdup_printf().
  - Check the return value of a "SELECT sum "in champlain_cache_purge.

15 years agoThe popularity is incremented through a prepared statement
Emmanuel Rodriguez [Wed, 13 May 2009 15:06:25 +0000 (17:06 +0200)]
The popularity is incremented through a prepared statement

15 years agoBetter error handling of SQL errors.
Emmanuel Rodriguez [Wed, 13 May 2009 14:32:51 +0000 (16:32 +0200)]
Better error handling of SQL errors.

Create the table 'tiles' only if it doesn't exist.
If there's an error with the cache lookup it will force a network reload.

15 years agoUse a prepare statement for fetching the Etag
Emmanuel Rodriguez [Wed, 13 May 2009 04:39:49 +0000 (06:39 +0200)]
Use a prepare statement for fetching the Etag

15 years agoUsing TEXT as the data types for filename and etag
Emmanuel Rodriguez [Tue, 12 May 2009 17:56:04 +0000 (19:56 +0200)]
Using TEXT as the data types for filename and etag

15 years agoBug fix: get_modified_time_string() fails if the time is not set
Emmanuel Rodriguez [Fri, 15 May 2009 15:28:19 +0000 (17:28 +0200)]
Bug fix: get_modified_time_string() fails if the time is not set

Updated the documentation for set_uri() and set_filename().

15 years agoCreate the getters/setters for Champlain::MapSourceDesc
Emmanuel Rodriguez [Sun, 17 May 2009 20:52:02 +0000 (22:52 +0200)]
Create the getters/setters for Champlain::MapSourceDesc

15 years agoAdd t/ChamplainMapSourceDesc.t to the MANIFEST
Emmanuel Rodriguez [Sun, 17 May 2009 20:49:14 +0000 (22:49 +0200)]
Add t/ChamplainMapSourceDesc.t to the MANIFEST

15 years agoThe tests for Champlain::MapSourceDesc are in ChamplainMapSourceDesc.t
Emmanuel Rodriguez [Sun, 17 May 2009 20:45:45 +0000 (22:45 +0200)]
The tests for Champlain::MapSourceDesc are in ChamplainMapSourceDesc.t

15 years agoTests for Champlain::MapSourceDesc
Emmanuel Rodriguez [Sun, 17 May 2009 20:45:09 +0000 (22:45 +0200)]
Tests for Champlain::MapSourceDesc

15 years agoUse the map constants instead of the long names (namespaces).
Emmanuel Rodriguez [Sun, 17 May 2009 08:16:07 +0000 (10:16 +0200)]
Use the map constants instead of the long names (namespaces).