Merge pull request #48 from ttobis/master

Fixed contex-menu and multi language support examples

Author: kplotnik

context_menu/demo.css context-menu/demo.csscontext_menu/demo.css renamed to context-menu/demo.css

@@ -9,6 +9,12 @@
 function addContextMenus(map) {
   // First we need to subscribe to the "contextmenu" event on the map
   map.addEventListener('contextmenu', function (e) {
+    // As we already handle contextmenu event callback on circle object,
+    // we don't do anything if target is different than the map.
+    if (e.target !== map) {
+      return;
+    }
+
     // "contextmenu" event might be triggered not only by a pointer,
     // but a keyboard button as well. That's why ContextMenuEvent
     // doesn't have a "currentPointer" property.
@@ -73,8 +79,7 @@ function addCircle(coord) {
         callback: function() {
           map.removeObject(circle);
         }
-      }),
-      H.util.ContextItem.SEPARATOR
+      })
     );
   });
 
@@ -109,4 +114,4 @@ var behavior = new H.mapevents.Behavior(new H.mapevents.MapEvents(map));
 var ui = H.ui.UI.createDefault(map, defaultLayers);
 
 // Step 5: main logic
-addContextMenus(map);
+addContextMenus(map);

context_menu/demo.details context-menu/demo.detailscontext_menu/demo.details renamed to context-menu/demo.details

@@ -1,23 +1,17 @@
-    
+
 /**
  * Switches the map language to simplified Chinese
  *
  * @param  {H.Map} map      A HERE Map instance within the application
  * @pama   {H.service.Platform} platform    A stub class to access HERE services
  */
 function switchMapLanguage(map, platform){
-  var mapTileService = platform.getMapTileService({
-      type: 'base'
-    }),
-    // Our layer will load tiles from the HERE Map Tile API
-    chineseMapLayer = mapTileService.createTileLayer(
-      'maptile',
-      'normal.day',
-      pixelRatio === 1 ? 256 : 512,
-      'png8',
-      {lg: 'CHI', ppi: pixelRatio === 1 ? undefined : 320}
-    );
-  map.setBaseLayer(chineseMapLayer);
+  // Create default layers
+  let defaultLayers = platform.createDefaultLayers({
+    lg: 'zh'
+  });
+  // Set the normal map variant of the vector map type
+  map.setBaseLayer(defaultLayers.vector.normal.map);
 
   // Display default UI components on the map and change default
   // language to simplified Chinese.
@@ -63,4 +57,4 @@ window.addEventListener('resize', () => map.getViewPort().resize());
 var behavior = new H.mapevents.Behavior(new H.mapevents.MapEvents(map));
 
 // Now use the map as required...
-switchMapLanguage(map, platform);
+switchMapLanguage(map, platform);

context_menu/demo.html context-menu/demo.htmlcontext_menu/demo.html renamed to context-menu/demo.html

@@ -57,7 +57,7 @@
                             "uid": "map-multi-language-support",
                             "title": "Multi-language support",
                             "shortDescription": "Display a map with labels in a foreign language",
-                            "published": false
+                            "published": true
                         },
                         {
                             "uid": "map-scale-bar-changing-from-the-metric-system",
@@ -251,6 +251,12 @@
                             "title": "Map Objects Event Delegation",
                             "shortDescription": "Use event delegation on map objects",
                             "published": true
+                        },
+                        {
+                            "uid": "context-menu",
+                            "title": "Context menu",
+                            "shortDescription": "Add a context menu to map and map object",
+                            "published": true
                         }
                     ]
                 },