Skip to content
This repository has been archived by the owner on Dec 1, 2020. It is now read-only.

Commit

Permalink
Merge pull request #198 from Esri/v2-beta-1
Browse files Browse the repository at this point in the history 
V2 beta 1
  • Loading branch information
@tomwayson
tomwayson committed Jan 10, 2016
2 parents 7d1fd8e + fe45fcc commit c394e99
Show file tree
Hide file tree
Showing 109 changed files with 829 additions and 5,325 deletions.
59 changes: 26 additions & 33 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ gulp.task('clean', function() {
gulp.task('build-core-js', function() {
return gulp.src([
'src/core/esri.core.module.js',
'src/core/esriLoader.js',
'src/core/esriRegistry.js',
'src/core/esriMapUtils.js',
'src/core/esriLayerUtils.js'])
'src/core/esriLoader.js'])
.pipe(concat('angular-esri-core.js'))
.pipe(gulp.dest('dist'))
.pipe(gulp.dest('site/lib'))
Expand All @@ -68,21 +65,13 @@ gulp.task('build-js', function() {
return gulp.src([
'src/core/esri.core.module.js',
'src/core/esriLoader.js',
'src/core/esriRegistry.js',
'src/core/esriMapUtils.js',
'src/core/esriLayerUtils.js',
'src/esri.map.module.js',
'src/map/EsriMapController.js',
'src/map/esriMap.js',
'src/map/esriLegend.js',
'src/layers/EsriLayerControllerBase.js',
'src/layers/EsriFeatureLayerController.js',
'src/layers/esriFeatureLayer.js',
'src/layers/EsriDynamicMapServiceLayerController.js',
'src/layers/esriDynamicMapServiceLayer.js',
'src/layers/EsriVectorTileLayerController.js',
'src/layers/esriVectorTileLayer.js',
'src/layers/esriInfoTemplate.js'])
'src/map/EsriHomeButtonController.js',
'src/map/EsriMapViewController.js',
'src/map/EsriSceneViewController.js',
'src/map/esriHomeButton.js',
'src/map/esriMapView.js',
'src/map/esriSceneView.js'])
.pipe(concat('angular-esri-map.js'))
.pipe(gulp.dest('dist'))
.pipe(gulp.dest('site/lib'))
Expand Down Expand Up @@ -171,21 +160,25 @@ gulp.task('karma', function(done) {
}, done).start();
});

gulp.task('test', ['karma-coverage', 'serve-test'], function() {
return gulp.src(['./test/e2e/specs/*.js'])
.pipe(angularProtractor({
'configFile': 'test/e2e/conf.js',
'args': ['--baseUrl', 'http://localhost:9002'],
'autoStartStopServer': true
// 'debug': true
}))
.on('end', function() {
browserSync.exit();
})
.on('error', function(e) {
throw e;
});
});

// TODO: run functional tests once we've written some
// for now just running karma coverage
gulp.task('test', ['karma-coverage']);
// gulp.task('test', ['karma-coverage', 'serve-test'], function() {
// return gulp.src(['./test/e2e/specs/*.js'])
// .pipe(angularProtractor({
// 'configFile': 'test/e2e/conf.js',
// 'args': ['--baseUrl', 'http://localhost:9002'],
// 'autoStartStopServer': true
// // 'debug': true
// }))
// .on('end', function() {
// browserSync.exit();
// })
// .on('error', function(e) {
// throw e;
// });
// });

gulp.task('ngdocs', [], function () {
var gulpDocs = require('gulp-ngdocs');
Expand Down
197 changes: 21 additions & 176 deletions site/app/appConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,195 +8,40 @@

var config = {
examplePageCategories: {
Map: [{
'2D': [{
toc: {
title: 'Simple Map',
description: 'Create a map by loading center, zoom, and basemap from an options object.',
url: urlPrefixes.templateHref + 'simple-map'
title: 'Feature Layer',
description: 'Load a feature layer onto a map',
url: urlPrefixes.templateHref + 'feature-layer'
},
route: {
path: urlPrefixes.routePath + 'simple-map',
templateUrl: urlPrefixes.routeTemplateUrl + 'simple-map.html',
controller: 'SimpleMapCtrl'
}
}, {
toc: {
title: 'Web Map',
description: 'Load a web map from ArcGIS Online and show changes to center and zoom level via bound scope properties.',
url: urlPrefixes.templateHref + 'web-map'
},
route: {
path: urlPrefixes.routePath + 'web-map',
templateUrl: urlPrefixes.routeTemplateUrl + 'web-map.html',
controller: 'WebMapCtrl'
}
}, {
toc: {
title: 'Set Map Center and Zoom',
description: 'Demonstrates two-way binding of the center and zoom properties.',
url: urlPrefixes.templateHref + 'set-center-zoom'
},
route: {
path: urlPrefixes.routePath + 'set-center-zoom',
templateUrl: urlPrefixes.routeTemplateUrl + 'set-center-zoom.html',
controller: 'CenterAndZoomCtrl'
}
}, {
toc: {
title: 'Map Events',
description: 'Shows how to listen for events raised by the map directive and get a direct reference to the map object.',
url: urlPrefixes.templateHref + 'map-events'
},
route: {
path: urlPrefixes.routePath + 'map-events',
templateUrl: urlPrefixes.routeTemplateUrl + 'map-events.html',
controller: 'MapEventsCtrl'
}
}, {
toc: {
title: 'Additional Map Options',
description: 'Shows how to load a map with additional map options.',
url: urlPrefixes.templateHref + 'additional-map-options'
},
route: {
path: urlPrefixes.routePath + 'additional-map-options',
templateUrl: urlPrefixes.routeTemplateUrl + 'additional-map-options.html',
controller: 'AdditionalMapOptionsCtrl'
path: urlPrefixes.routePath + 'feature-layer',
templateUrl: urlPrefixes.routeTemplateUrl + 'feature-layer.html',
controller: 'FeatureLayerCtrl'
}
}],
Basemap: [{
toc: {
title: 'Set Basemap',
description: 'Shows how to use angular binding to link a select list to the basemap property of the map.',
url: urlPrefixes.templateHref + 'set-basemap'
},
route: {
path: urlPrefixes.routePath + 'set-basemap',
templateUrl: urlPrefixes.routeTemplateUrl + 'set-basemap.html',
controller: 'BasemapCtrl'
}
}, {
toc: {
title: 'No Basemap',
description: 'Shows how to load a map without a basemap using more complex map options such as a custom Extent.',
url: urlPrefixes.templateHref + 'no-basemap'
},
route: {
path: urlPrefixes.routePath + 'no-basemap',
templateUrl: urlPrefixes.routeTemplateUrl + 'no-basemap.html',
controller: 'NoBasemapCtrl'
}
}, {
'3D': [{
toc: {
title: 'Custom Basemap',
description: 'Shows how to load a map with a custom basemap.',
url: urlPrefixes.templateHref + 'custom-basemap'
title: 'Scene View',
description: 'Use the scene view directive to load a tiled basemap onto a 3D globe.',
url: urlPrefixes.templateHref + 'scene-view'
},
route: {
path: urlPrefixes.routePath + 'custom-basemap',
templateUrl: urlPrefixes.routeTemplateUrl + 'custom-basemap.html',
controller: 'CustomBasemapCtrl'
path: urlPrefixes.routePath + 'scene-view',
templateUrl: urlPrefixes.routeTemplateUrl + 'scene-view.html',
controller: 'SceneViewCtrl'
}
}],
Layers: [{
toc: {
title: 'Feature Layers',
description: 'Loads two feature layers into the map and shows how to bind layer visibility to a check box.',
url: urlPrefixes.templateHref + 'feature-layers'
},
route: {
path: urlPrefixes.routePath + 'feature-layers',
templateUrl: urlPrefixes.routeTemplateUrl + 'feature-layers.html',
controller: 'FeatureLayersCtrl'
}
}, {
toc: {
title: 'Dynamic Map Service Layer',
description: 'Loads a dynamic map service layer into the map and shows how to bind layer properties such as visibility and opacity to external controls.',
url: urlPrefixes.templateHref + 'dynamic-map-service-layer'
},
route: {
path: urlPrefixes.routePath + 'dynamic-map-service-layer',
templateUrl: urlPrefixes.routeTemplateUrl + 'dynamic-map-service-layer.html',
controller: 'DynamicMapServiceLayerCtrl'
}
}, {
toc: {
title: 'Multiple Dynamic Map Service Layers',
description: 'Loads several dynamic map service layers into the map and shows how to bind layer properties as well as setup custom popups.',
url: urlPrefixes.templateHref + 'dynamic-map-service-layers'
},
route: {
path: urlPrefixes.routePath + 'dynamic-map-service-layers',
templateUrl: urlPrefixes.routeTemplateUrl + 'dynamic-map-service-layers.html',
controller: 'DynamicMapServiceLayersCtrl'
}
}, {
toc: {
title: 'Vector Tile Layer',
description: 'Shows how to load a map with a vector tile layer.',
url: urlPrefixes.templateHref + 'vector-tile-layer'
},
route: {
path: urlPrefixes.routePath + 'vector-tile-layer',
templateUrl: urlPrefixes.routeTemplateUrl + 'vector-tile-layer.html',
controller: 'VectorTileLayerCtrl'
}
}, {
toc: {
title: 'Add / Remove Layers',
description: 'Shows how to add/remove layers to/from the map.',
url: urlPrefixes.templateHref + 'add-remove-layers'
},
route: {
path: urlPrefixes.routePath + 'add-remove-layers',
templateUrl: urlPrefixes.routeTemplateUrl + 'add-remove-layers.html',
controller: 'AddRemoveLayersCtrl'
}
}, {
toc: {
title: 'Layer Events',
description: 'Shows how to listen for events raised by layer directives and get a direct reference to the layer object.',
url: urlPrefixes.templateHref + 'layer-events'
},
route: {
path: urlPrefixes.routePath + 'layer-events',
templateUrl: urlPrefixes.routeTemplateUrl + 'layer-events.html',
controller: 'LayerEventsCtrl'
}
}, {
toc: {
title: 'Legend',
description: 'Show a legend for the map.',
url: urlPrefixes.templateHref + 'legend'
},
route: {
path: urlPrefixes.routePath + 'legend',
templateUrl: urlPrefixes.routeTemplateUrl + 'legend.html',
controller: 'LegendCtrl'
}
}],
Other: [{
toc: {
title: 'Other Esri Modules',
description: 'Shows how to use other Esri modules that we have not included directives for (such as graphics, symbols, toolbars, etc.).',
url: urlPrefixes.templateHref + 'other-esri-modules'
},
route: {
path: urlPrefixes.routePath + 'other-esri-modules',
templateUrl: urlPrefixes.routeTemplateUrl + 'other-esri-modules.html',
controller: 'OtherEsriModulesController'
}
}, {
Controls: [{
toc: {
title: 'Registry Pattern',
description: 'Shows how to get a reference to the map object by using the registry.',
url: urlPrefixes.templateHref + 'registry-pattern'
title: 'Home Button',
description: 'A home button directive to return the map/scene view to it\'s starting point',
url: urlPrefixes.templateHref + 'home-button'
},
route: {
path: urlPrefixes.routePath + 'registry-pattern',
templateUrl: urlPrefixes.routeTemplateUrl + 'registry-pattern.html',
controller: 'RegistryPatternCtrl'
path: urlPrefixes.routePath + 'home-button',
templateUrl: urlPrefixes.routeTemplateUrl + 'home-button.html',
controller: 'HomeButtonCtrl'
}
}]
},
Expand Down
19 changes: 0 additions & 19 deletions site/app/examples/add-remove-layers.html
View file

This file was deleted.

31 changes: 0 additions & 31 deletions site/app/examples/add-remove-layers.js
View file

This file was deleted.

31 changes: 0 additions & 31 deletions site/app/examples/additional-map-options.html
View file

This file was deleted.

Loading

0 comments on commit c394e99

Please sign in to comment.