Skip to content

Commit

Permalink
Merge pull request #25 from gavinr/update-deps
Browse files Browse the repository at this point in the history
Misc changes from esri-leaflet
  • Loading branch information
gavinr authored Mar 9, 2022
2 parents 94384e7 + c4986bb commit 7c74b95
Show file tree
Hide file tree
Showing 11 changed files with 15,159 additions and 64 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ debug/*.html
site/build

# Built Files
dist/**/*.js
dist/**/*.map
dist
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Here is a quick example to get you started.
<script src="https://unpkg.com/[email protected]"></script>

<!-- Esri Leaflet and Esri Leaflet Heatmap -->
<script src="https://unpkg.com/esri-leaflet@2.0.2"></script>
<script src="https://unpkg.com/esri-leaflet-heatmap@2.0.0"></script>
<script src="https://unpkg.com/esri-leaflet@3"></script>
<script src="https://unpkg.com/esri-leaflet-heatmap@2"></script>

<style>
body {margin:0;padding:0;}
Expand All @@ -41,12 +41,12 @@ Here is a quick example to get you started.
<div id="map"></div>

<script>
var map = L.map('map').setView([ 40.706, -73.926], 14);
var map = L.map('map').setView([41.759, -88.157], 12);
L.esri.basemapLayer('Gray').addTo(map);
L.esri.Heat.featureLayer({
url: 'https://services.arcgis.com/rOo16HdIMeOBI4Mb/ArcGIS/rest/services/Graffiti_Reports/FeatureServer/0',
radius: 12
url: 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/CommunityAddressing/MapServer/0',
radius: 10
}).addTo(map);
</script>

Expand Down
8 changes: 4 additions & 4 deletions debug/sample.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
make a copy of this file in the same directory if you'd like git to ignore your local changes
*/

var map = L.map('map').setView([ 40.706, -73.926], 14);
var map = L.map('map').setView([41.759, -88.157], 12);

L.esri.basemapLayer('Gray').addTo(map);
var heatLayer = L.esri.Heat.featureLayer({
url: 'https://services.arcgis.com/rOo16HdIMeOBI4Mb/ArcGIS/rest/services/Graffiti_Reports/FeatureServer/0',
radius: 12
L.esri.Heat.featureLayer({
url: 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/CommunityAddressing/MapServer/0',
radius: 10
}).addTo(map);
</script>

Expand Down
18 changes: 11 additions & 7 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Generated on Fri May 30 2014 15:44:45 GMT-0400 (EDT)

module.exports = function (config) {
config.set({
var configuration = {
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',

Expand All @@ -25,12 +25,14 @@ module.exports = function (config) {

// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {},
preprocessors: {
'dist/**/*.js': ['sourcemap', 'coverage']
},

// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress'],
reporters: ['mocha', 'coverage'],

// web server port
port: 9876,
Expand All @@ -40,19 +42,19 @@ module.exports = function (config) {

// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,
logLevel: config.LOG_WARN,

// enable / disable watching file and executing tests whenever any file changes
autoWatch: true,

// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: [
// 'Chrome',
'Chrome'
// 'ChromeCanary',
// 'Firefox',
// 'Safari',
'PhantomJS'
// 'PhantomJS'
],

// Continuous Integration mode
Expand All @@ -66,5 +68,7 @@ module.exports = function (config) {
{type: 'text'}
]
}
});
};

config.set(configuration);
};
Loading

0 comments on commit 7c74b95

Please sign in to comment.