Skip to content

Commit

Permalink
Minor version with few bug fixes :
Browse files Browse the repository at this point in the history
 * Fix some map navigation issues in the three panel layout after important browser width resize (pan impossible on some part of the map)
 * Add the map Esri logo on the three-layout panel
 * Prevent closed black popup to reappear after a map zoom
  • Loading branch information
Gregory L'Azou committed May 9, 2013
1 parent 1f18ec2 commit 5297884
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 25 deletions.
2 changes: 1 addition & 1 deletion MapTour/deploy/app/maptour-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion MapTour/deploy/app/maptour-min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions MapTour/deploy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
sourceLayerTitle: "",
// Use the first data record as an introduction instead of a point (can be overridden through URL)
firstRecordAsIntro: true,
// Optional zoom level to be applied for the story points following introduction (e.g: 0 to 16 for Gray Canvas, 0 to 19 for Street Map, -1 to disable)
// Optional zoom level to be applied for the story points following introduction (can be overridden through URL) (e.g: 0 to 16 for Gray Canvas, 0 to 19 for Street Map, -1 to disable)
zoomLevel: -1,
// If the webmap uses Bing Maps data, you will need to provide your Bing Maps Key
bingmapskey: "",
Expand All @@ -46,9 +46,9 @@
geometryserviceurl: "//tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer"
};
</script>

<script type="text/javascript">
var version = '1.0.1';
var version = '1.1';
var isProduction = true;

function loadJS(url, isExternal)
Expand Down
2 changes: 0 additions & 2 deletions MapTour/src/app/storymaps/maptour/builder/Builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,6 @@ define(["storymaps/maptour/core/WebApplicationData",
app.data.initialExtentHasBeenEdited = true;
}

// TODO
_this.incrementSaveCounter();
dojo.publish("CORE_UPDATE_UI");
}
Expand Down Expand Up @@ -805,7 +804,6 @@ define(["storymaps/maptour/core/WebApplicationData",

function isNonEditableHostedFS(layer)
{
// TODO
return false;
//return ! layer.isEditable() && layer.url.match(/\/\/services[a-zA-Z0-9]*.arcgis.com\//);
}
Expand Down
6 changes: 5 additions & 1 deletion MapTour/src/app/storymaps/maptour/core/Core.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ img {
float:inherit;
}

.logo-med {
.modern-layout .logo-med {
display: none !important;
}

.modern-layout:not(.mobile-view) .esriAttribution {
display: none !important;
}

Expand Down
12 changes: 3 additions & 9 deletions MapTour/src/app/storymaps/maptour/core/Core.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ define(["esri/map",
spatialReference: {
wkid:4326
}
})
}),
showAttribution: true
},
ignorePopups: true,
bingMapsKey: configOptions.bingmapskey
Expand Down Expand Up @@ -451,21 +452,14 @@ define(["esri/map",
// If it's a webmap layer check that all mandatory fields are present to allow additional decoration layer
if( ! layer.url && layer.graphics && layer.graphics.length > 0 ) {
var fields = app.data.electFields(layer.graphics[0].attributes);

if (fields && fields.allWebmapLayerMandatoryFieldsFound()) {
app.data.setSourceLayer(layer);
break;
}
}
else {
app.data.setSourceLayer(layer);

/*
var newFL = new esri.layers.FeatureLayer(layer.url, {userIsAdmin: true});
app.map.addLayer(newFL);
app.data.setSourceLayer(newFL);
layer.setVisibility(false);
*/

break;
}
}
Expand Down
3 changes: 2 additions & 1 deletion MapTour/src/app/storymaps/maptour/ui/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ define(["storymaps/ui/inlineFieldEdit/InlineFieldEdit", "dojo/has"], function(In
new InlineFieldEdit(selector, editFieldsEnterEvent, editFieldsExitEvent);

if( ! isInBuilderMode && ! subtitle ) {
$(selector + ' #headerDesktop .title').css("margin-top", "22px");
$(selector + ' #headerDesktop .title').css("padding-top", 40);
$(selector + ' #headerDesktop .subtitle').css("height", 32);
}

// Mobile init
Expand Down
5 changes: 5 additions & 0 deletions MapTour/src/app/storymaps/ui/crossfader/CrossFader.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ define(["storymaps/ui/inlineFieldEdit/InlineFieldEdit", "storymaps/ui/loadingInd
$(_current).css("left",(ALLOWABLE_WIDTH - $(_current).width()) / 2);
$(_current).css("top",(ALLOWABLE_HEIGHT - $(_current).height()) / 2);

$(_other).width($(_current).width());
$(_other).height($(_current).height());
$(_other).css("left", $(_current).css("left"));
$(_other).css("top", $(_current).css("top"));

resizePlacardContainer();
}

Expand Down
3 changes: 2 additions & 1 deletion MapTour/src/app/storymaps/ui/multiTips/MultiTips.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ define(["dojo/dom-style", "dojo/dom-construct"], function(domStyle, domConstruct

var event2 = dojo.connect(settings.map, "onZoomEnd", function(extent)
{
refreshTips(extent, true);
if( ! forceHidden )
refreshTips(extent, true);
});

var event3 = dojo.connect(settings.map, "onPan", function(extent, delta)
Expand Down
6 changes: 3 additions & 3 deletions MapTour/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
sourceLayerTitle: "",
// Use the first data record as an introduction instead of a point (can be overridden through URL)
firstRecordAsIntro: true,
// Optional zoom level to be applied for the story points following introduction (e.g: 0 to 16 for Gray Canvas, 0 to 19 for Street Map, -1 to disable)
// Optional zoom level to be applied for the story points following introduction (can be overridden through URL) (e.g: 0 to 16 for Gray Canvas, 0 to 19 for Street Map, -1 to disable)
zoomLevel: -1,
// If the webmap uses Bing Maps data, you will need to provide your Bing Maps Key
bingmapskey: "",
Expand All @@ -46,9 +46,9 @@
geometryserviceurl: "//tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer"
};
</script>

<script type="text/javascript">
var version = '1.0.1';
var version = '1.1';
var isProduction = false;

function loadJS(url, isExternal)
Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ The template is now available in two versions:

To use this template on ArcGIS Online you need to be a member of an Organization and have Publisher or Administrator access. The template can be accessed from the ArcGIS Online's map viewer Share dialog.

[View it live](http://storymaps.esri.com/stories/demo/map_tour/?webmap=7190edafe7464cb19c1caf1360cd6ee5) | [Features](http://arcgis.com/apps/MapTour/preview.html) | [User Download (production application, doesn't include source code)](https://github.com/Esri/map-tour-storytelling-template-js/raw/master/Storytelling-MapTour-1.0.zip) | [Developer Download (source code)](https://github.com/Esri/map-tour-storytelling-template-js/archive/master.zip)
[View it live](http://storymaps.esri.com/stories/demo/map_tour/?webmap=7190edafe7464cb19c1caf1360cd6ee5) | [Features](http://arcgis.com/apps/MapTour/preview.html) | [User Download (production application, doesn't include source code)](https://github.com/Esri/map-tour-storytelling-template-js/raw/master/Storytelling-MapTour-1.1.zip) | [Developer Download (source code)](https://github.com/Esri/map-tour-storytelling-template-js/archive/master.zip)

![App](https://raw.github.com/Esri/map-tour-storytelling-template-js/master/map-tour-storytelling-template-js.png)

## How to configure and deploy a Map Tour

Download the [User Download archive](https://github.com/Esri/map-tour-storytelling-template-js/raw/master/Storytelling-MapTour-1.0.zip), it contains the following files:
Download the [User Download archive](https://github.com/Esri/map-tour-storytelling-template-js/raw/master/Storytelling-MapTour-1.1.zip), it contains the following files:

| File | Contains |
| ------------------------------------------ | --------------------------------------------------------------------- |
Expand Down Expand Up @@ -66,7 +66,13 @@ Yes, web map designed for the previous version should continue to work without a

### What's new?

#### Map Tour 1.0.1 released on 13/04/26
#### Map Tour 1.1 released on 05/09/2013
Minor version with few bug fixes :
* Fix some map navigation issues in the three panel layout after important browser width resize (pan impossible on some part of the map)
* Add the map Esri logo on the three-layout panel
* Prevent closed black popup to reappear after a map zoom

#### Map Tour 1.0 released on 04/26/2013
* Responsive web design that offer a new user experience on Smartphone
* Localized in 20 languages: Arabic, Brazilian Portuguese, Chinese, Danish, Dutch, French, English, German, Hebrew, Italian, Japanese, Korean, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, Spanish and Swedish.
* Support of Feature Service
Expand Down
Binary file added Storytelling-MapTour-1.1.zip
Binary file not shown.

0 comments on commit 5297884

Please sign in to comment.