Merge pull request #4 from oganexon/develop

1.1.0

Author: SteelAlloy

CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+<!-- ## [Unreleased]
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security -->
+
+## [1.1.0] - 2020-05-05
+
+### Added
+
+- `rails` command

README.md

@@ -32,6 +32,7 @@
   - [tpll](#tpll)
   - [tpdms](#tpdms)
   - [draw](#draw)
+  - [rails](#rails)
 - [🔍 Find a railroad name](#%f0%9f%94%8d-find-a-railroad-name)
 - [📜 Roadmap](#%f0%9f%93%9c-roadmap)
 - [🏗️ Contributing](#%f0%9f%8f%97%ef%b8%8f-contributing)
@@ -84,6 +85,7 @@ These are WorldEdit scripts, if blocks are modified you have access to `//undo`.
 - **tpll** : Replaces the tpll command since permissions can be a problem.
 - **tpdms** : Same as tpll but takes `degrees minutes seconds` (such as `47°35'6.32"N 6°53'50.06"E` ).
 - **draw** : Traces any imported shape of an OpenStreetMap query - railroads, roads, etc.
+- **rails** : Traces all railroads in an area
 
 Do you need another function? Request it [here](https://github.com/oganexon/BTE-tools/issues).
 
@@ -143,7 +145,7 @@ Examples :
 ```
 Traces any imported shape of an OpenStreetMap query - railroads, roads, etc.
 
-Options :
+Flags :
  - **u** (up): Draw a block above
 
 Setup :
@@ -162,6 +164,32 @@ Examples :
 /cs draw file3 stone u
 ```
 
+### rails
+
+```bash
+/cs <mode> [...args] [flags]
+```
+Traces all railroads in an area
+
+Modes:
+ - **radius** Select rails in a radius `<radius> [flags]`
+ - **region** Select rails in a region `[flags]`
+ - **regionEdge** Select rails in a region and draw only in the defined region `[flags]`
+
+Flags :
+ - **u** (up): Draw a block above
+
+Examples :
+
+```bash
+/cs rails radius 7
+/cs rails radius 50 u
+/cs rails region
+/cs rails region u
+/cs rails regionEdge
+/cs rails regionEdge u
+```
+
 
 
 ## 🔍 Find a railroad name
@@ -208,3 +236,4 @@ Distributed under the MIT License. See `LICENSE` for more information.
 ## Contact
 
 Oganexon#2001 - Discord
+[email protected]

gulpfile.babel.js

@@ -1,24 +1,26 @@
 const { src, dest, series } = require('gulp')
 const babel = require('gulp-babel')
 const uglify = require('gulp-uglify')
-const bro = require('gulp-bro')
+const browserify = require('gulp-bro')
 const fs = require('fs')
 const path = require('path')
 
-const files = ['tpll', 'tpdms', 'draw', 'list', 'help']
-
 exports.default = series(bundle, copyData)
 
 function bundle () {
-  return src(`src/+(${files.join('|')}).js`)
-    .pipe(bro())
+  return src('src/*.js')
+    .pipe(browserify())
     .pipe(babel())
     .pipe(uglify())
     .pipe(dest('craftscripts/'))
 }
 
 function copyData (cb) {
-  fs.mkdirSync(path.resolve(__dirname, './craftscripts/data'))
-  fs.copyFileSync(path.resolve(__dirname, './src/data/conformal.txt'), path.resolve(__dirname, './craftscripts/data/conformal.txt'))
-  cb()
+  fs.mkdir(path.resolve(__dirname, './craftscripts/data'), (err) => {
+    if (err && err.code !== 'EEXIST') throw err
+    fs.copyFile(path.resolve(__dirname, './src/data/conformal.txt'), path.resolve(__dirname, './craftscripts/data/conformal.txt'), (err) => {
+      if (err) throw err
+      cb()
+    })
+  })
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bte-tools",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Awesome tools and scripts to enhance your experience on the Build The Earth project!",
   "scripts": {
     "lint": "standard src/**/*.js --fix",
@@ -26,5 +26,7 @@
     "gulp-uglify": "^3.0.2",
     "standard": "^14.3.3"
   },
-  "dependencies": {}
+  "dependencies": {
+    "osmtogeojson": "^3.0.0-beta.4"
+  }
 }

src/draw.js

@@ -1,16 +1,16 @@
-/* global importPackage Packages context player argv BufferedReader FileReader Vector */
-const getProjection = require('./getProjection')
+/* global importPackage Packages context player argv BufferedReader FileReader */
+const draw = require('./modules/drawGeoJSON')
 
 importPackage(Packages.java.io)
 importPackage(Packages.java.awt)
 importPackage(Packages.com.sk89q.worldedit)
 importPackage(Packages.com.sk89q.worldedit.math)
 importPackage(Packages.com.sk89q.worldedit.blocks)
 
-const usage = `/cs draw <file> <block> [options]
+const usage = `/cs draw <file> <block> [flags]
  • §o/cs draw rails1 iron_block
  • §o/cs draw file3 stone u
-Options:
+Flags:
  • §lu§r§c Draw a block above`
 
 context.checkArgs(2, 3, usage)
@@ -21,15 +21,8 @@ if (argv[3]) {
   options.up = argv[3].includes('u')
 }
 
-const blocks = context.remember()
-let changedBlocks = 0
-
-const ignoreBlocks = getIgnoredBlocks()
-const allowedBlocks = getAllowedBlocks()
-
-const DataError = new Error('Incorrect data format')
-
-draw(parse(readFile()))
+player.print('§7Please wait...')
+draw(readFile(), argv[2], options)
 
 function readFile () {
   const file = context.getSafeOpenFile('drawings', argv[1], 'geojson', ['json', 'geojson'])
@@ -52,112 +45,3 @@ function readFile () {
     return JSON.parse(bufStr)
   }
 }
-
-function parse (data) {
-  if (data.type !== 'FeatureCollection') throw DataError
-  if (!Array.isArray(data.features)) throw DataError
-
-  const geometry = []
-  let lines = 0
-  for (let i = 0; i < data.features.length; i++) {
-    if (data.features[i].geometry.type !== 'LineString') continue
-    const coordinates = data.features[i].geometry.coordinates
-    geometry.push(coordinates)
-    lines += coordinates.length
-  }
-
-  player.print(`§7${lines} lines to draw`)
-
-  return geometry
-}
-
-function draw (geometry) {
-  const y = player.getPosition().y
-  const block = context.getBlock(argv[2])
-
-  player.print('§7Please wait...')
-  const projection = getProjection()
-
-  for (let i = 0; i < geometry.length; i++) {
-    const shape = geometry[i]
-    for (let j = 0; j < shape.length - 1; j++) {
-      const [x1, z1] = projection.fromGeo(...shape[j])
-      const [x2, z2] = projection.fromGeo(...shape[j + 1])
-      drawLine(x1, y, z1, x2, y, z2, block)
-    }
-  }
-
-  player.print('Operation completed (' + changedBlocks + ' blocks affected).')
-}
-
-function drawLine (x1, y1, z1, x2, y2, z2, block) {
-  const lenX = x2 - x1
-  const lenY = y2 - y1
-  const lenZ = z2 - z1
-
-  const max = Math.max(Math.abs(lenX), Math.abs(lenY), Math.abs(lenZ))
-
-  const incrX = lenX / max
-  const incrY = lenY / max
-  const incrZ = lenZ / max
-
-  const incrMax = Math.max(Math.abs(incrX), Math.abs(incrY), Math.abs(incrZ))
-
-  for (var i = 0; i < max; i += incrMax) {
-    var pos = new Vector(Math.floor(x1 + incrX * i), Math.floor(y1 + incrY * i), Math.floor(z1 + incrZ * i))
-
-    while (!ignoreBlocks.includes(blocks.getBlock(pos.add(new Vector(0, 1, 0))).id)) {
-      pos = pos.add(new Vector(0, 1, 0))
-    }
-    while (ignoreBlocks.includes(blocks.getBlock(pos).id)) {
-      pos = pos.add(new Vector(0, -1, 0))
-    }
-
-    if (allowedBlocks.includes(blocks.getBlock(pos).id)) {
-      if (options.up) {
-        pos = pos.add(new Vector(0, 1, 0))
-      }
-      blocks.setBlock(pos, block)
-      changedBlocks++
-    }
-  }
-}
-
-function getIgnoredBlocks () {
-  return [
-    context.getBlock('air').id,
-    context.getBlock('tallgrass').id,
-    context.getBlock('sapling').id,
-    context.getBlock('log').id,
-    context.getBlock('log2').id,
-    context.getBlock('leaves').id,
-    context.getBlock('leaves2').id,
-    context.getBlock('deadbush').id,
-    context.getBlock('red_flower').id,
-    context.getBlock('yellow_flower').id,
-    context.getBlock('red_mushroom').id,
-    context.getBlock('brown_mushroom').id,
-    context.getBlock('vine').id,
-    context.getBlock('waterlily').id,
-    context.getBlock('cactus').id,
-    context.getBlock('reeds').id,
-    context.getBlock('pumpkin').id,
-    context.getBlock('melon_block').id,
-    context.getBlock('snow_layer').id,
-    context.getBlock('double_plant').id
-  ]
-}
-
-function getAllowedBlocks () {
-  return [
-    context.getBlock('grass').id,
-    context.getBlock('dirt').id,
-    context.getBlock('stone').id,
-    context.getBlock('sand').id,
-    context.getBlock('grass_path').id,
-    context.getBlock('concrete').id,
-    context.getBlock('gravel').id,
-    context.getBlock('water').id,
-    context.getBlock('lava').id
-  ]
-}

src/list.js

@@ -1,9 +1,15 @@
 /* global player */
+const bte = require('../package.json')
 
 const list = `Usage: /cs <COMMAND> [ARGS]
  • list : Lists all available commands.
  • tpll : Replaces the tpll command.
  • tpdms : Same as tpll but takes degrees minutes seconds (such as 47°35'6.32"N 6°53'50.06"E ).
- • draw : Traces any imported shape of an OpenStreetMap query - railroads, roads, etc.`
+ • draw : Traces any imported shape of an OpenStreetMap query - railroads, roads, etc.
+ • rails : Traces all railroads in an area
+
+BTE-tools v${bte.version}
+Request features & report issues : ${bte.bugs.url}
+ `
 
 player.print(list)